]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit8ff72312e2a48aecfbe662a39d9d4a2e6284e8ce
treee587a5377ada98fed8cfa6c8ee63125361f2818a
parenta2106e07d9c0b5a340aa527bcade83f4b4b60aa0
parent80e7c449e8b9ba334a4a21064a0b0281b9f62f70
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