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> |
||
|---|---|---|
| .. | ||
| broadcom.c | ||
| cicada.c | ||
| davicom.c | ||
| fixed.c | ||
| Kconfig | ||
| lxt.c | ||
| Makefile | ||
| marvell.c | ||
| mdio_bus.c | ||
| phy_device.c | ||
| phy.c | ||
| qsemi.c | ||
| smsc.c | ||
| vitesse.c | ||