Tejun Heo 959d851caa Merge branch 'for-3.5' of ../cgroup into block/for-3.5/core-merged ... cgroup/for-3.5 contains the following changes which blk-cgroup needs to proceed with the on-going cleanup. * Dynamic addition and removal of cftypes to make config/stat file handling modular for policies. * cgroup removal update to not wait for css references to drain to fix blkcg removal hang caused by cfq caching cfqgs. Pull in cgroup/for-3.5 into block/for-3.5/core. This causes the following conflicts in block/blk-cgroup.c. * 761b3ef50e "cgroup: remove cgroup_subsys argument from callbacks" conflicts with blkiocg_pre_destroy() addition and blkiocg_attach() removal. Resolved by removing @subsys from all subsys methods. * 676f7c8f84 "cgroup: relocate cftype and cgroup_subsys definitions in controllers" conflicts with ->pre_destroy() and ->attach() updates and removal of modular config. Resolved by dropping forward declarations of the methods and applying updates to the relocated blkio_subsys. * 4baf6e3325 "cgroup: convert all non-memcg controllers to the new cftype interface" builds upon the previous item. Resolved by adding ->base_cftypes to the relocated blkio_subsys. Signed-off-by: Tejun Heo <tj@kernel.org>		2012-04-01 12:55:00 -07:00
..
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-03-30 16:45:39 -07:00
asm-generic	Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-29 18:12:23 -07:00
crypto
drm
keys
linux	Merge branch 'for-3.5' of ../cgroup into block/for-3.5/core-merged	2012-04-01 12:55:00 -07:00
math-emu
media
misc
mtd
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-03-27 16:52:32 -07:00
pcmcia
rdma
rxrpc
scsi	SCSI updates on 20120331	2012-03-31 13:31:23 -07:00
sound
target
trace	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-03-30 12:44:29 -07:00
video	Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm	2012-03-27 18:17:02 -07:00
xen	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
Kbuild