Merge commit 'v3.0-rc7' into devicetree/next
Grant Likely [Sat, 16 Jul 2011 02:11:34 +0000 (20:11 -0600)]

Trivial merge