Merge remote-tracking branch 'origin' into spi/next
Grant Likely [Thu, 17 Mar 2011 19:46:58 +0000 (13:46 -0600)]
Pull in Linus' tree to pick up changes required for the langwell gpio fixes


Trivial merge