Jens Axboe 4c63f5646e Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core ... Conflicts: block/blk-core.c block/blk-flush.c drivers/md/raid1.c drivers/md/raid10.c drivers/md/raid5.c fs/nilfs2/btnode.c fs/nilfs2/mdt.c Signed-off-by: Jens Axboe <jaxboe@fusionio.com>		2011-03-10 08:58:35 +01:00
..
blk-cgroup.c
blk-cgroup.h	blk-cgroup: Lower minimum weight from 100 to 10.	2011-03-08 19:45:00 +01:00
blk-core.c	Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core	2011-03-10 08:58:35 +01:00
blk-exec.c	Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core	2011-03-10 08:58:35 +01:00
blk-flush.c	Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core	2011-03-10 08:58:35 +01:00
blk-integrity.c
blk-ioc.c
blk-iopoll.c
blk-lib.c	block: fix kernel-doc format for blkdev_issue_zeroout	2011-03-01 13:45:24 -05:00
blk-map.c
blk-merge.c
blk-settings.c	Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core	2011-03-10 08:58:35 +01:00
blk-softirq.c
blk-sysfs.c	block: Move blk_throtl_exit() call to blk_cleanup_queue()	2011-03-02 19:06:49 -05:00
blk-tag.c
blk-throttle.c	Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core	2011-03-10 08:58:35 +01:00
blk-timeout.c
blk.h	block: remove per-queue plugging	2011-03-10 08:52:07 +01:00
bsg.c
cfq-iosched.c	Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core	2011-03-10 08:58:35 +01:00
cfq.h
compat_ioctl.c
deadline-iosched.c	block: remove per-queue plugging	2011-03-10 08:52:07 +01:00
elevator.c	Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core	2011-03-10 08:58:35 +01:00
genhd.c	block: Don't implicitly trigger event check on disk_unblock_events()	2011-03-09 19:54:27 +01: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
Makefile
noop-iosched.c	block: remove per-queue plugging	2011-03-10 08:52:07 +01:00
scsi_ioctl.c