Russell King f0006314d3 Merge branch 'imx' into devel ...

Conflicts:

	arch/arm/mm/Kconfig

2008-07-10 16:41:50 +01:00

..

at25.c

…

atmel_spi.c

…

atmel_spi.h

…

au1550_spi.c

…

Kconfig

…

Makefile

…

mpc52xx_psc_spi.c

mpc5200_psc_spi: typo fix in header block

2008-05-14 19:11:12 -07:00

omap2_mcspi.c

…

omap_uwire.c

…

pxa2xx_spi.c

…

spi_bfin5xx.c

…

spi_bitbang.c

…

spi_butterfly.c

…

spi_imx.c

Merge branch 'imx' into devel

2008-07-10 16:41:50 +01:00

spi_lm70llp.c

…

spi_mpc83xx.c

…

spi_s3c24xx_gpio.c

…

spi_s3c24xx.c

…

spi_sh_sci.c

…

spi_txx9.c

…

spi.c

…

spidev.c

spi: fix refcount-related spidev oops-on-rmmod

2008-06-06 11:29:08 -07:00

tle62x0.c

…

xilinx_spi.c

…