tree bfe1707dda7e755b8b550c6796e2649813bcfbb9
parent 36885ff0e6563687e6152da6d311abbf83c0198f
parent 7b7adc4a016a1decb806eb71ecab98721fa7f146
author Grant Likely <grant.likely@secretlab.ca> 1300391218 -0600
committer Grant Likely <grant.likely@secretlab.ca> 1300391286 -0600

Merge remote-tracking branch 'origin' into spi/next

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