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: Allow creation of hierarchical cgroups

2010-11-15 19:37:36 +01:00

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

block: Fix double free in blk_integrity_unregister

2010-10-15 15:49:18 +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

block: fix kernel-doc format for blkdev_issue_zeroout

2011-03-01 13:45:24 -05: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

Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block

2011-01-13 10:45:01 -08:00

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

generic-ipi: remove CSD_FLAG_WAIT

2009-02-25 14:13:44 +01:00

blk-sysfs.c

block: Move blk_throtl_exit() call to blk_cleanup_queue()

2011-03-02 19:06:49 -05: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

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

block: ensure jiffies wrap is handled correctly in blk_rq_timed_out_timer

2010-04-21 17:42:08 +02:00

blk.h

block: remove per-queue plugging

2011-03-10 08:52:07 +01: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

Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core

2011-03-10 08:58:35 +01:00

cfq.h

blk-cgroup: Prepare the base for supporting more than one IO control policies

2010-09-16 08:42:04 +02: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 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

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