Merge commit 'v2.6.38-rc8' into spi/next
authorGrant Likely <grant.likely@secretlab.ca>
Sat, 12 Mar 2011 08:25:53 +0000 (01:25 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Sat, 12 Mar 2011 08:25:53 +0000 (01:25 -0700)
commit9c3c8afccb6a163fd2be739f511e863eab668702
treee587a5377ada98fed8cfa6c8ee63125361f2818a
parent290293eda2c6dd368476d71433bdef07c39a6829
parenta5abba989deceb731047425812d268daf7536575
Merge commit 'v2.6.38-rc8' into spi/next

Conflicts:
drivers/spi/pxa2xx_spi_pci.c
Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt
drivers/gpio/pca953x.c
drivers/spi/pxa2xx_spi_pci.c
drivers/spi/spi_sh_msiof.c