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
..
calibrate.c	init: check printed flag to skip printing message	2012-03-23 16:58:38 -07:00
do_mounts_initrd.c	get rid of pointless includes of ext2_fs.h	2012-03-31 16:03:15 -04:00
do_mounts_md.c	init: mark __user address space on string literals	2010-10-26 16:52:15 -07:00
do_mounts_rd.c	new helper: ext2_image_size()	2012-03-31 16:03:16 -04:00
do_mounts.c	init/do_mounts.c: print error code on mount failure	2012-03-23 16:58:38 -07:00
do_mounts.h	md: move lots of #include lines out of .h files and into .c	2009-03-31 14:33:13 +11:00
initramfs.c	init/initramfs.c: should use umode_t	2012-01-03 22:55:14 -05:00
Kconfig	Merge branch 'for-3.5' of ../cgroup into block/for-3.5/core-merged	2012-04-01 12:55:00 -07:00
main.c	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
Makefile	kbuild: move compile.h to include/generated	2009-12-12 13:08:14 +01:00
noinitramfs.c	init: mark __user address space on string literals	2010-10-26 16:52:15 -07:00
version.c	userns: add a user_namespace as creator/owner of uts_namespace	2011-03-23 19:46:59 -07:00