Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ... Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.		2010-12-22 18:57:02 +01:00
..
blk-cgroup.c	Merge branch 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block	2010-10-22 17:00:32 -07:00
blk-cgroup.h	blkio-throttle: limit max iops value to UINT_MAX	2010-10-01 21:16:41 +02:00
blk-core.c	block: remove REQ_HARDBARRIER	2010-11-10 14:54:09 +01:00
blk-exec.c	block: Prevent hang_check firing during long I/O	2010-09-24 15:52:09 +02:00
blk-flush.c	block: remove BLKDEV_IFL_WAIT	2010-09-16 20:52:58 +02:00
blk-integrity.c	block: Fix double free in blk_integrity_unregister	2010-10-15 15:49:18 +02:00
blk-ioc.c	block: remove unused copy_io_context()	2010-11-11 13:40:11 +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: remove BLKDEV_IFL_WAIT	2010-09-16 20:52:58 +02: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: Deprecate QUEUE_FLAG_CLUSTER and use queue_limits instead	2010-12-17 08:35:53 +01:00
blk-settings.c	block: max hardware sectors limit wrapper	2010-12-17 08:36:01 +01:00
blk-softirq.c
blk-sysfs.c	block: Deprecate QUEUE_FLAG_CLUSTER and use queue_limits instead	2010-12-17 08:35:53 +01: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: Correct the placement of smp_rmb()	2010-12-01 19:34:52 +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	Revert "block: fix accounting bug on cross partition merges"	2010-10-24 22:06:02 +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	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04: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
elevator.c	block: remove REQ_HARDBARRIER	2010-11-10 14:54:09 +01:00
genhd.c	Revert "block: fix accounting bug on cross partition merges"	2010-10-24 22:06:02 +02:00
ioctl.c	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
Kconfig	blkio: Core implementation of throttle policy	2010-09-16 08:42:52 +02: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	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
scsi_ioctl.c	block: take care not to overflow when calculating total iov length	2010-11-10 14:40:42 +01:00