James Bottomley 1aedf2ccc6 Merge mulgrave-w:git/linux-2.6 ...

Conflicts:

	include/linux/blkdev.h

Trivial merge to incorporate tag prototypes.

2006-09-23 21:03:52 -05:00

..

as-iosched.c

…

blktrace.c

…

cfq-iosched.c

…

deadline-iosched.c

…

elevator.c

elv_unregister: fix possible crash on module unload

2006-08-22 12:52:23 -07:00

genhd.c

…

ioctl.c

…

Kconfig

…

Kconfig.iosched

…

ll_rw_blk.c

Merge mulgrave-w:git/linux-2.6

2006-09-23 21:03:52 -05:00

Makefile

…

noop-iosched.c

…

scsi_ioctl.c

…