Jens Axboe 698567f3fa Merge commit 'v2.6.39' into for-2.6.40/core ... Since for-2.6.40/core was forked off the 2.6.39 devel tree, we've had churn in the core area that makes it difficult to handle patches for eg cfq or blk-throttle. Instead of requiring that they be based in older versions with bugs that have been fixed later in the rc cycle, merge in 2.6.39 final. Also fixes up conflicts in the below files. Conflicts: drivers/block/paride/pcd.c drivers/cdrom/viocd.c drivers/ide/ide-cd.c Signed-off-by: Jens Axboe <jaxboe@fusionio.com>		2011-05-20 20:33:15 +02:00
..
blk-cgroup.c	blk-throttle: Use task_subsys_state() to determine a task's blkio_cgroup	2011-05-16 15:24:08 +02:00
blk-cgroup.h	blk-throttle: Use task_subsys_state() to determine a task's blkio_cgroup	2011-05-16 15:24:08 +02:00
blk-core.c	block: don't delay blk_run_queue_async	2011-05-18 12:24:03 +02:00
blk-exec.c	block: Remove 'plug/unplug' comment in blk_execute_rq_nowait	2011-05-05 15:10:05 -06:00
blk-flush.c	block: hold queue if flush is running for non-queueable flush drive	2011-05-06 11:36:25 -06:00
blk-integrity.c	dm: improve block integrity support	2011-04-05 23:52:43 +02:00
blk-ioc.c
blk-iopoll.c
blk-lib.c	blkdev: Do not return -EOPNOTSUPP if discard is supported	2011-05-06 19:30:01 -06:00
blk-map.c
blk-merge.c	block: attempt to merge with existing requests on plug flush	2011-03-21 10:14:27 +01:00
blk-settings.c	block: Fix discard topology stacking and reporting	2011-05-18 10:37:35 +02:00
blk-softirq.c
blk-sysfs.c	Merge commit 'v2.6.39' into for-2.6.40/core	2011-05-20 20:33:15 +02:00
blk-tag.c
blk-throttle.c	blk-throttle: Use task_subsys_state() to determine a task's blkio_cgroup	2011-05-16 15:24:08 +02:00
blk-timeout.c
blk.h	Merge commit 'v2.6.39' into for-2.6.40/core	2011-05-20 20:33:15 +02:00
bsg.c
cfq-iosched.c	blk-throttle: Use task_subsys_state() to determine a task's blkio_cgroup	2011-05-16 15:24:08 +02:00
cfq.h	blk-cgroup: Add unaccounted time to timeslice_used.	2011-03-12 16:54:00 +01:00
compat_ioctl.c
deadline-iosched.c	block: remove per-queue plugging	2011-03-10 08:52:07 +01:00
elevator.c	Merge commit 'v2.6.39' into for-2.6.40/core	2011-05-20 20:33:15 +02:00
genhd.c	block: don't propagate unlisted DISK_EVENTs to userland	2011-04-21 19:43:58 +02:00
ioctl.c	block: fix refcounting in BLKBSZSET	2011-02-24 08:54:21 -08:00
Kconfig
Kconfig.iosched
Makefile
noop-iosched.c	block: remove per-queue plugging	2011-03-10 08:52:07 +01:00
scsi_ioctl.c