cf9b59e9d3
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> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| amba-pl022.c | ||
| atmel_spi.c | ||
| atmel_spi.h | ||
| au1550_spi.c | ||
| coldfire_qspi.c | ||
| davinci_spi.c | ||
| dw_spi.c | ||
| dw_spi_mmio.c | ||
| dw_spi_pci.c | ||
| mpc52xx_psc_spi.c | ||
| mpc52xx_spi.c | ||
| omap2_mcspi.c | ||
| omap_spi_100k.c | ||
| omap_uwire.c | ||
| orion_spi.c | ||
| pxa2xx_spi.c | ||
| spi.c | ||
| spi_bfin5xx.c | ||
| spi_bitbang.c | ||
| spi_butterfly.c | ||
| spi_gpio.c | ||
| spi_imx.c | ||
| spi_lm70llp.c | ||
| spi_mpc8xxx.c | ||
| spi_nuc900.c | ||
| spi_ppc4xx.c | ||
| spi_s3c24xx.c | ||
| spi_s3c24xx_fiq.S | ||
| spi_s3c24xx_fiq.h | ||
| spi_s3c24xx_gpio.c | ||
| spi_s3c64xx.c | ||
| spi_sh_msiof.c | ||
| spi_sh_sci.c | ||
| spi_stmp.c | ||
| spi_txx9.c | ||
| spidev.c | ||
| tle62x0.c | ||
| xilinx_spi.c | ||
| xilinx_spi.h | ||
| xilinx_spi_of.c | ||
| xilinx_spi_pltfm.c | ||