Grant Likely 9c3c8afccb Merge commit 'v2.6.38-rc8' into spi/next ...

Conflicts:
	drivers/spi/pxa2xx_spi_pci.c

2011-03-12 01:25:53 -07:00

..

fsl-spi.txt

…

spi_altera.txt

…

spi_oc_tiny.txt

…

spi-bus.txt

…