Thomas Gleixner 7acdbb3f35 Merge branch 'linus' into x86/platform ... Reason: Import mainline device tree changes on which further patches depend on or conflict. Trivial conflict in: drivers/spi/pxa2xx_spi_pci.c Signed-off-by: Thomas Gleixner <tglx@linutronix.de>		2011-02-23 09:21:41 +01:00
..
amba-pl022.c	spi/amba-pl022: fixing compilation warning.	2011-01-14 15:26:07 -07:00
ath79_spi.c	SPI: Add SPI controller driver for the Atheros AR71XX/AR724X/AR913X SoCs	2011-01-18 19:30:27 +01:00
atmel_spi.c	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
atmel_spi.h
au1550_spi.c
coldfire_qspi.c	spi/m68knommu: Coldfire QSPI platform support	2010-12-29 23:28:25 -07:00
davinci_spi.c
dw_spi_mid.c	spi/dw_spi: add DMA support	2010-12-24 01:23:25 -07:00
dw_spi_mmio.c	spi/dw_spi: don't treat NULL clk as an error	2011-01-11 08:20:07 -07:00
dw_spi_pci.c	spi/dw_spi: add DMA support	2010-12-24 01:23:25 -07:00
dw_spi.c	spi/dw_spi Typo change diable to disable.	2010-12-30 23:44:55 -07:00
ep93xx_spi.c
Kconfig	SPI: Add SPI controller driver for the Atheros AR71XX/AR724X/AR913X SoCs	2011-01-18 19:30:27 +01:00
Makefile	SPI: Add SPI controller driver for the Atheros AR71XX/AR724X/AR913X SoCs	2011-01-18 19:30:27 +01:00
mpc52xx_psc_spi.c	spi/mpc52xx-psc-spi: move probe/remove to proper sections	2010-12-24 11:18:34 -07:00
mpc52xx_spi.c	spi/mpc52xx-spi: fix annotation for remove()-pointer	2010-12-24 01:57:17 -07:00
mpc512x_psc_spi.c
omap2_mcspi.c	Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6	2011-01-07 17:08:46 -08:00
omap_spi_100k.c
omap_uwire.c
orion_spi.c
pxa2xx_spi_pci.c	Merge branch 'linus' into x86/platform	2011-02-23 09:21:41 +01:00
pxa2xx_spi.c	driver-core: remove conditionals around devicetree pointers	2011-01-21 09:24:48 -07:00
spi_bfin5xx.c
spi_bitbang_txrx.h
spi_bitbang.c
spi_butterfly.c
spi_fsl_espi.c	spi/fsl_espi: change the read behaviour of the SPIRF	2010-12-29 23:04:46 -07:00
spi_fsl_lib.c
spi_fsl_lib.h
spi_fsl_spi.c
spi_gpio.c
spi_imx.c	spi/imx: Add i.MX53 support	2011-01-12 22:50:54 -07:00
spi_lm70llp.c
spi_nuc900.c
spi_ppc4xx.c
spi_s3c24xx_fiq.h
spi_s3c24xx_fiq.S
spi_s3c24xx_gpio.c
spi_s3c24xx.c
spi_s3c64xx.c
spi_sh_msiof.c	spi/spi_sh_msiof: fix wrong address calculation, which leads to an Oops	2011-01-21 09:26:24 -07:00
spi_sh_sci.c
spi_stmp.c
spi_tegra.c	spi: tegra: don't treat NULL clk as an error	2011-01-10 16:44:01 -07:00
spi_topcliff_pch.c	spi/topcliff: Typo fix threhold to threshold	2010-12-31 17:49:30 -07:00
spi_txx9.c
spi.c	spi / PM: Support dev_pm_ops	2010-12-25 15:32:27 +01:00
spidev.c
tle62x0.c
xilinx_spi.c	driver-core: remove conditionals around devicetree pointers	2011-01-21 09:24:48 -07:00