Merge remote-tracking branch 'robh/for-next' into devicetree/next
authorGrant Likely <grant.likely@linaro.org>
Sun, 29 Mar 2015 07:59:58 +0000 (08:59 +0100)
committerGrant Likely <grant.likely@linaro.org>
Sun, 29 Mar 2015 07:59:58 +0000 (08:59 +0100)
commita2166ca5f3204794e8b59f01c93a0f1564e3e138
treeb667828c308ffd79f1b2bd8fc1da95e43dfef4e3
parent37791b6fbe7ab772020e714d34515f144fa981a0
parent01218bf14ee60d4a2d6c667ebdbba3ae9a7a1d66
Merge remote-tracking branch 'robh/for-next' into devicetree/next

Conflicts:
drivers/of/unittest.c
drivers/of/unittest.c