Merge remote-tracking branch 'origin' into spi/next
authorGrant Likely <grant.likely@secretlab.ca>
Thu, 17 Mar 2011 19:46:58 +0000 (13:46 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Thu, 17 Mar 2011 19:48:06 +0000 (13:48 -0600)
commit2dd22997679a88874c131f6e6ffb963e6d43b3a6
treebfe1707dda7e755b8b550c6796e2649813bcfbb9
parent36885ff0e6563687e6152da6d311abbf83c0198f
parent7b7adc4a016a1decb806eb71ecab98721fa7f146
Merge remote-tracking branch 'origin' into spi/next

Pull in Linus' tree to pick up changes required for the langwell gpio fixes