Linus Torvalds e2688f00dc Merge branch 'blk-softirq' of git://brick.kernel.dk/data/git/linux-2.6-block ...

Manual merge for trivial #include changes

2006-01-09 09:26:40 -08:00

..

as-iosched.c

…

cfq-iosched.c

…

deadline-iosched.c

…

elevator.c

…

genhd.c

…

ioctl.c

…

Kconfig

…

Kconfig.iosched

…

ll_rw_blk.c

Merge branch 'blk-softirq' of git://brick.kernel.dk/data/git/linux-2.6-block

2006-01-09 09:26:40 -08:00

Makefile

…

noop-iosched.c

…

scsi_ioctl.c

…