linux/block
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 Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
blktrace.c [PATCH] blktrace: fix read-ahead bit 2006-07-25 15:04:13 +02:00
cfq-iosched.c [PATCH] cfq_cic_link: fix usage of wrong cfq_io_context 2006-08-21 10:02:54 +02:00
deadline-iosched.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
elevator.c elv_unregister: fix possible crash on module unload 2006-08-22 12:52:23 -07:00
genhd.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ioctl.c [PATCH] lockdep: annotate the BLKPG_DEL_PARTITION ioctl 2006-07-14 21:53:53 -07:00
Kconfig
Kconfig.iosched [PATCH] Make CFQ the default IO scheduler 2006-06-23 17:10:39 +02:00
ll_rw_blk.c Merge mulgrave-w:git/linux-2.6 2006-09-23 21:03:52 -05:00
Makefile
noop-iosched.c [PATCH] elevator switching race 2006-06-08 15:14:23 -07:00
scsi_ioctl.c