Merge branch 'for-grant' of git://git.jdl.com/software/linux-3.0 into devicetree...
Grant Likely [Wed, 5 Oct 2011 16:52:27 +0000 (10:52 -0600)]

Trivial merge