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)
Conflicts:
drivers/of/unittest.c


Trivial merge