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