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	dt: Move device tree documentation out of powerpc directory	2011-01-31 00:09:01 -07:00
spi-bus.txt	dt: Move device tree documentation out of powerpc directory	2011-01-31 00:09:01 -07:00
spi_altera.txt	spi: New driver for Altera SPI	2011-02-22 14:59:53 -07:00
spi_oc_tiny.txt	spi: add OpenCores tiny SPI driver	2011-02-22 14:59:53 -07:00