Merge remote-tracking branch 'robh/for-next' into devicetree/next
authorGrant Likely <grant.likely@linaro.org>
Tue, 30 Jun 2015 13:28:52 +0000 (14:28 +0100)
committerGrant Likely <grant.likely@linaro.org>
Tue, 30 Jun 2015 13:28:52 +0000 (14:28 +0100)

Trivial merge