Merge remote-tracking branch 'grant/devicetree/next' into for-next
authorRob Herring <rob.herring@calxeda.com>
Thu, 7 Nov 2013 16:34:46 +0000 (10:34 -0600)
committerRob Herring <rob.herring@calxeda.com>
Thu, 7 Nov 2013 16:34:46 +0000 (10:34 -0600)

Trivial merge