Merge remote-tracking branch 'grant/devicetree/next' into for-next
authorRob Herring <robh@kernel.org>
Thu, 12 Feb 2015 03:28:45 +0000 (21:28 -0600)
committerRob Herring <robh@kernel.org>
Thu, 12 Feb 2015 03:28:45 +0000 (21:28 -0600)

Trivial merge