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	block: Clean up exit_io_context() source code.	2010-12-21 15:07:45 +01:00
blk-iopoll.c	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
blk-lib.c	blkdev: Do not return -EOPNOTSUPP if discard is supported	2011-05-06 19:30:01 -06:00
blk-map.c	block: check for proper length of iov entries earlier in blk_rq_map_user_iov()	2010-11-29 10:04:50 +01:00
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	generic-ipi: remove CSD_FLAG_WAIT	2009-02-25 14:13:44 +01:00
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	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
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	block: ensure jiffies wrap is handled correctly in blk_rq_timed_out_timer	2010-04-21 17:42:08 +02:00
blk.h	Merge commit 'v2.6.39' into for-2.6.40/core	2011-05-20 20:33:15 +02:00
bsg.c	[SCSI] bsg: correct fault if queue object removed while dev_t open	2010-12-09 09:41:14 -06:00
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	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
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: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
Kconfig.iosched	blk-cgroup: config options re-arrangement	2010-04-26 19:27:56 +02:00
Makefile	Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block	2010-10-22 17:07:18 -07:00
noop-iosched.c	block: remove per-queue plugging	2011-03-10 08:52:07 +01:00
scsi_ioctl.c	block: take care not to overflow when calculating total iov length	2010-11-10 14:40:42 +01:00