Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree ... Merging in current state of Linus' tree to deal with merge conflicts and build failures in vio.c after merge. Conflicts: drivers/i2c/busses/i2c-cpm.c drivers/i2c/busses/i2c-mpc.c drivers/net/gianfar.c Also fixed up one line in arch/powerpc/kernel/vio.c to use the correct node pointer. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>		2010-05-22 00:36:56 -06:00
..
amba-pl022.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
atmel_spi.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
atmel_spi.h
au1550_spi.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
coldfire_qspi.c
davinci_spi.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
dw_spi.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
dw_spi_mmio.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
dw_spi_pci.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
Kconfig	OMAP4: SPI: Fix Driver Kconfig	2010-05-20 11:17:51 -07:00
Makefile
mpc52xx_psc_spi.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
mpc52xx_spi.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
omap2_mcspi.c	omap2_mcspi: small fixes of output data format	2010-04-28 01:25:43 -06:00
omap_spi_100k.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
omap_uwire.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
orion_spi.c
pxa2xx_spi.c	[ARM] pxa: add namespace on ssp	2010-05-11 17:25:06 +02:00
spi.c	spi: spi_device memory should be released instead of device.	2010-04-28 01:17:58 -06:00
spi_bfin5xx.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
spi_bitbang.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
spi_butterfly.c
spi_gpio.c
spi_imx.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
spi_lm70llp.c
spi_mpc8xxx.c	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
spi_nuc900.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
spi_ppc4xx.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
spi_s3c24xx.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
spi_s3c24xx_fiq.h
spi_s3c24xx_fiq.S
spi_s3c24xx_gpio.c
spi_s3c64xx.c	spi/spi_s3c64xx.c: Fix continuation line formats	2010-02-02 01:07:07 -07:00
spi_sh_msiof.c	Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6	2010-02-25 15:38:03 -08:00
spi_sh_sci.c
spi_stmp.c
spi_txx9.c
spidev.c
tle62x0.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
xilinx_spi.c
xilinx_spi.h
xilinx_spi_of.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
xilinx_spi_pltfm.c