Merge branch 'for-grant' of git://git.jdl.com/software/linux-3.0 into devicetree/next