Merge remote-tracking branch 'grant/devicetree/next' into for-next
authorRob Herring <rob.herring@calxeda.com>
Mon, 26 Nov 2012 17:00:47 +0000 (11:00 -0600)
committerRob Herring <rob.herring@calxeda.com>
Mon, 26 Nov 2012 17:00:47 +0000 (11:00 -0600)

Trivial merge