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> |
||
---|---|---|
.. | ||
as-iosched.c | ||
blktrace.c | ||
cfq-iosched.c | ||
deadline-iosched.c | ||
elevator.c | ||
genhd.c | ||
ioctl.c | ||
Kconfig | ||
Kconfig.iosched | ||
ll_rw_blk.c | ||
Makefile | ||
noop-iosched.c | ||
scsi_ioctl.c |