]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'spi/spi/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 03:34:51 +0000 (13:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 03:34:51 +0000 (13:34 +1000)
commit2aa6fe3977bc98549ea2d1dda136a5c55f67d393
tree95b49a2b0567cc5fdd18f3ef4095767e72009b9e
parenta2b3a872986fb96e21e80f7649d998f2c430efc5
parentd2265a50885b984f51f4ad40c6ec396461cd4334
Merge remote-tracking branch 'spi/spi/next'

Conflicts:
drivers/spi/spi-pl022.c
drivers/spi/spi-pl022.c