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

[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

make elv_try_merge() static, kill the dead declaration of

2006-01-09 14:44:15 +01:00

genhd.c

…

ioctl.c

[PATCH] Add block_device_operations.getgeo block device method

2006-01-08 20:13:54 -08:00

Kconfig

[PATCH] s390: cleanup Kconfig

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

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

[BLOCK] scsi_ioctl: file can be NULL from ioctl_by_bdev()

2006-01-09 14:52:21 +01:00