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	block: get rid of elevator_t typedef	2008-12-29 08:29:50 +01:00
blk-barrier.c	block: fix empty barrier on write-through w/ ordered tag	2008-12-29 08:28:45 +01:00
blk-core.c	block: don't use plugging on SSD devices	2008-12-29 08:28:45 +01:00
blk-exec.c
blk-integrity.c
blk-ioc.c
blk-map.c	When block layer fails to map iov, it calls bio_unmap_user to undo	2008-12-03 12:41:20 +01:00
blk-merge.c
blk-settings.c	block: use min_not_zero in blk_queue_stack_limits	2008-12-29 08:29:51 +01:00
blk-softirq.c	block: make blk_softirq_init() static	2008-12-29 08:29:51 +01:00
blk-sysfs.c	block: don't take lock on changing ra_pages	2008-12-29 08:28:43 +01:00
blk-tag.c	block/blk-tag.c: cleanup kernel-doc	2008-12-29 08:28:43 +01:00
blk-timeout.c	block: leave the request timeout timer running even on an empty list	2008-12-29 08:28:42 +01:00
blk.h	cpumask: Replace cpu_coregroup_map with cpu_coregroup_mask	2008-12-26 22:23:43 +10:30
blktrace.c	blktrace: port to tracepoints	2008-11-26 12:13:34 +01:00
bsg.c	Enforce a minimum SG_IO timeout	2008-12-05 14:49:18 -08:00
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	block: don't take lock on changing ra_pages	2008-12-29 08:28:43 +01:00
deadline-iosched.c	block: get rid of elevator_t typedef	2008-12-29 08:29:50 +01:00
elevator.c	block: get rid of elevator_t typedef	2008-12-29 08:29:50 +01:00
genhd.c	block: add one-hit cache for disk partition lookup	2008-12-29 08:29:51 +01:00
ioctl.c	block: don't take lock on changing ra_pages	2008-12-29 08:28:43 +01:00
Kconfig	Get rid of CONFIG_LSF	2008-12-29 08:29:51 +01:00
Kconfig.iosched
Makefile
noop-iosched.c	block: get rid of elevator_t typedef	2008-12-29 08:29:50 +01:00
scsi_ioctl.c	scsi-ioctl: use clock_t <> jiffies	2008-12-29 08:28:42 +01:00