Tejun Heo 1db1e31b1e Merge branch 'cgroup-rmdir-updates' into cgroup/for-3.8 ... Pull rmdir updates into for-3.8 so that further callback updates can be put on top. This pull created a trivial conflict between the following two commits. 8c7f6edbda ("cgroup: mark subsystems with broken hierarchy support and whine if cgroups are nested for them") ed95779340 ("cgroup: kill cgroup_subsys->__DEPRECATED_clear_css_refs") The former added a field to cgroup_subsys and the latter removed one from it. They happen to be colocated causing the conflict. Keeping what's added and removing what's removed resolves the conflict. Signed-off-by: Tejun Heo <tj@kernel.org>		2012-11-05 09:21:51 -08:00
..
partitions	s390/partitions: make partition detection independent from DASD ioctls	2012-09-26 15:45:05 +02:00
blk-cgroup.c	Merge branch 'cgroup-rmdir-updates' into cgroup/for-3.8	2012-11-05 09:21:51 -08:00
blk-cgroup.h	blkcg: implement per-blkg request allocation	2012-06-26 18:42:49 -04:00
blk-core.c	Merge branch 'for-3.7/core' of git://git.kernel.dk/linux-block	2012-10-11 09:04:23 +09:00
blk-exec.c	[SCSI] block: Fix blk_execute_rq_nowait() dead queue handling	2012-07-20 08:58:39 +01:00
blk-flush.c	blk-flush: move the queue kick into	2011-10-24 16:24:31 +02:00
blk-integrity.c	block: add export.h to files using EXPORT_SYMBOL/THIS_MODULE macros	2011-10-31 19:31:12 -04:00
blk-ioc.c	block: uninitialized ioc->nr_tasks triggers WARN_ON	2012-08-01 12:17:27 +02: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: Make blkdev_issue_zeroout use WRITE SAME	2012-09-20 14:31:49 +02:00
blk-map.c	block: re-use existing 'reading' variable instead of checking direction again	2011-12-21 15:27:24 +01:00
blk-merge.c	block: Implement support for WRITE SAME	2012-09-20 14:31:45 +02:00
blk-settings.c	block: Implement support for WRITE SAME	2012-09-20 14:31:45 +02:00
blk-softirq.c	sched, block: Unify cache detection	2012-01-27 13:28:48 +01:00
blk-sysfs.c	block: lift the initial queue bypass mode on blk_register_queue() instead of blk_init_allocated_queue()	2012-09-21 15:32:57 +02:00
blk-tag.c	block/blk-tag.c: Remove useless kfree	2012-09-12 22:25:12 +02:00
blk-throttle.c	workqueue: use mod_delayed_work() instead of __cancel + queue	2012-08-21 13:18:24 -07:00
blk-timeout.c	block: Drop dead function blk_abort_queue()	2012-06-15 08:46:23 +02:00
blk.h	block: Clean up special command handling logic	2012-09-20 14:31:38 +02:00
bsg-lib.c	block: drop custom queue draining used by scsi_transport_{iscsi|fc}	2012-06-25 11:53:48 +02:00
bsg.c	bsg: fix sysfs link remove warning	2012-02-08 20:02:03 +01:00
cfq-iosched.c	block: blkcg_policy_cfq shouldn't be used if !CONFIG_CFQ_GROUP_IOSCHED	2012-06-04 10:02:29 +02:00
compat_ioctl.c	block: Add BLKROTATIONAL ioctl	2012-01-11 16:29:31 +01:00
deadline-iosched.c	elevator: make elevator_init_fn() return 0/-errno	2012-03-06 21:27:21 +01:00
elevator.c	block: Clean up special command handling logic	2012-09-20 14:31:38 +02:00
genhd.c	Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2012-10-02 09:54:49 -07:00
ioctl.c	Merge branch 'for-3.7/core' of git://git.kernel.dk/linux-block	2012-10-11 09:04:23 +09:00
Kconfig	move fs/partitions to block/	2012-01-03 22:54:06 -05:00
Kconfig.iosched	blkcg: make CONFIG_BLK_CGROUP bool	2012-03-06 21:27:21 +01:00
Makefile	separate partition format handling from generic code	2012-01-03 22:54:06 -05:00
noop-iosched.c	elevator: make elevator_init_fn() return 0/-errno	2012-03-06 21:27:21 +01:00
partition-generic.c	block: add partition resize function to blkpg ioctl	2012-08-01 12:24:18 +02:00
scsi_ioctl.c	scsi: Silence unnecessary warnings about ioctl to partition	2012-06-15 12:52:46 +02:00