9db7372445
Conflicts: drivers/ata/libata-scsi.c include/linux/libata.h Futher merge of Linus's head and compilation fixups. Signed-Off-By: David Howells <dhowells@redhat.com> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
pxa2xx_spi.c | ||
spi_bitbang.c | ||
spi_butterfly.c | ||
spi_mpc83xx.c | ||
spi_s3c24xx_gpio.c | ||
spi_s3c24xx.c | ||
spi.c |