ed40d0c472
Conflicts: sound/soc/pxa/pxa2xx-i2s.c |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| atmel_spi.c | ||
| atmel_spi.h | ||
| au1550_spi.c | ||
| mpc52xx_psc_spi.c | ||
| omap2_mcspi.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_mpc83xx.c | ||
| spi_s3c24xx.c | ||
| spi_s3c24xx_gpio.c | ||
| spi_sh_sci.c | ||
| spi_txx9.c | ||
| spidev.c | ||
| tle62x0.c | ||
| xilinx_spi.c | ||