Rusty Russell 2ca1a61583 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	arch/x86/kernel/io_apic.c

2008-12-31 23:05:57 +10:30

..

as-iosched.c

…

blk-barrier.c

…

blk-core.c

…

blk-exec.c

…

blk-integrity.c

…

blk-ioc.c

…

blk-map.c

…

blk-merge.c

…

blk-settings.c

…

blk-softirq.c

block: make blk_softirq_init() static

2008-12-29 08:29:51 +01:00

blk-sysfs.c

…

blk-tag.c

…

blk-timeout.c

…

blk.h

…

blktrace.c

…

bsg.c

…

cfq-iosched.c

cfq-iosched: fix race between exiting queue and exiting task

2008-12-29 08:29:52 +01:00

cmd-filter.c

…

compat_ioctl.c

…

deadline-iosched.c

…

elevator.c

…

genhd.c

…

ioctl.c

…

Kconfig

Get rid of CONFIG_LSF

2008-12-29 08:29:51 +01:00

Kconfig.iosched

…

Makefile

…

noop-iosched.c

…

scsi_ioctl.c

…