Merge remote-tracking branch 'grant/devicetree/merge' into dt-fixes
authorRob Herring <robh@kernel.org>
Mon, 30 Dec 2013 18:09:47 +0000 (12:09 -0600)
committerRob Herring <robh@kernel.org>
Mon, 30 Dec 2013 18:09:47 +0000 (12:09 -0600)

Trivial merge