Merge remote-tracking branch 'rmk/devel-stable' into HEAD
authorRob Herring <rob.herring@calxeda.com>
Mon, 24 Oct 2011 19:02:37 +0000 (14:02 -0500)
committerRob Herring <rob.herring@calxeda.com>
Mon, 24 Oct 2011 19:02:37 +0000 (14:02 -0500)

Trivial merge