Linus Torvalds d99cf9d679 Merge branch 'post-2.6.15' of git://brick.kernel.dk/data/git/linux-2.6-block ...

Manual fixup for merge with Jens' "Suspend support for libata", commit
ID 9b847548663ef1039dd49f0eb4463d001e596bc3.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2006-01-06 09:01:25 -08:00

..

as-iosched.c

[BLOCK] as-iosched: update alias handling

2006-01-06 09:39:03 +01:00

cfq-iosched.c

[BLOCK] mark some block/ variables cons

2006-01-06 09:46:02 +01:00

deadline-iosched.c

[BLOCK] mark some block/ variables cons

2006-01-06 09:46:02 +01:00

elevator.c

[BLOCK] reimplement handling of barrier request

2006-01-06 09:51:03 +01:00

genhd.c

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

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

ioctl.c

…

Kconfig

[PATCH] s390: cleanup Kconfig

2006-01-06 08:33:53 -08:00

Kconfig.iosched

[BLOCK] iosched: fix setting of default io scheduler

2005-11-04 08:44:58 +01:00

ll_rw_blk.c

[BLOCK] reimplement handling of barrier request

2006-01-06 09:51:03 +01:00

Makefile

…

noop-iosched.c

[BLOCK] noop-iosched: reimplementation of request dispatching

2005-11-12 10:56:52 +01:00

scsi_ioctl.c

[BLOCK] mark some block/ variables cons

2006-01-06 09:46:02 +01:00