Linus Torvalds db9edfd7e3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 ...

Trivial manual merge fixup for usb_find_interface clashes.

2006-01-04 18:44:12 -08:00

..

as-iosched.c

[PATCH] as-iosched: remove state assertion in as_add_request()

2005-11-21 11:04:52 -08:00

cfq-iosched.c

…

deadline-iosched.c

…

elevator.c

…

genhd.c

[PATCH] driver core: replace "hotplug" by "uevent"

2006-01-04 16:18:08 -08:00

ioctl.c

…

Kconfig

…

Kconfig.iosched

…

ll_rw_blk.c

[SCSI] seperate max_sectors from max_hw_sectors

2005-12-15 15:11:40 -08:00

Makefile

…

noop-iosched.c

…

scsi_ioctl.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2006-01-04 16:30:12 -08:00