tree b667828c308ffd79f1b2bd8fc1da95e43dfef4e3
parent 37791b6fbe7ab772020e714d34515f144fa981a0
parent 01218bf14ee60d4a2d6c667ebdbba3ae9a7a1d66
author Grant Likely <grant.likely@linaro.org> 1427615998 +0100
committer Grant Likely <grant.likely@linaro.org> 1427615998 +0100

Merge remote-tracking branch 'robh/for-next' into devicetree/next

Conflicts:
	drivers/of/unittest.c