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> |
||
---|---|---|
.. | ||
k7.c | ||
Makefile | ||
mce.c | ||
mce.h | ||
non-fatal.c | ||
p4.c | ||
p5.c | ||
p6.c | ||
therm_throt.c | ||
winchip.c |