Merge branch 'for-grant' of git://git.jdl.com/software/linux-3.0 into devicetree...
authorGrant Likely <grant.likely@secretlab.ca>
Wed, 5 Oct 2011 16:52:27 +0000 (10:52 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Wed, 5 Oct 2011 16:52:27 +0000 (10:52 -0600)
commit9514a56753a8d379db36bed424588e1842f2bfcc
treed13cdfcd9473f521c3b108770dba57e81e557a30
parent4cd7f7a31178ff8a15ad2bc1258b9b2bf2cf51a4
parent6add6967a4a57e2156b96e62f28bcbe1901d16c1
Merge branch 'for-grant' of git://git.jdl.com/software/linux-3.0 into devicetree/next