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)
Pull in Linus' tree to pick up changes required for the langwell gpio fixes


Trivial merge