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
..
debug	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
events	Merge branch 'linus' into perf/urgent	2012-03-26 17:19:03 +02:00
gcov
irq	Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-30 18:08:05 -07:00
power
sched	cgroup: convert all non-memcg controllers to the new cftype interface	2012-04-01 12:09:55 -07:00
time	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-29 14:16:48 -07:00
trace	tracing: Fix ent_size in trace output	2012-03-27 12:05:44 -04:00
.gitignore
acct.c
async.c
audit_tree.c
audit_watch.c
audit.c
audit.h
auditfilter.c
auditsc.c
backtracetest.c
bounds.c
capability.c
cgroup_freezer.c	cgroup: convert all non-memcg controllers to the new cftype interface	2012-04-01 12:09:55 -07:00
cgroup.c	cgroup: make css->refcnt clearing on cgroup removal optional	2012-04-01 12:09:56 -07:00
compat.c
configs.c
cpu_pm.c
cpu.c
cpuset.c	cgroup: convert all non-memcg controllers to the new cftype interface	2012-04-01 12:09:55 -07:00
crash_dump.c
cred.c
delayacct.c
dma.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
elfcore.c
exec_domain.c
exit.c	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
extable.c
fork.c	Merge branch 'for-3.5' of ../cgroup into block/for-3.5/core-merged	2012-04-01 12:55:00 -07:00
freezer.c
futex_compat.c	futex: Mark get_robust_list as deprecated	2012-03-29 11:37:17 +02:00
futex.c	futex: Mark get_robust_list as deprecated	2012-03-29 11:37:17 +02:00
groups.c
hrtimer.c
hung_task.c
irq_work.c
itimer.c
jump_label.c
kallsyms.c
Kconfig.freezer
Kconfig.hz
Kconfig.locks
Kconfig.preempt
kexec.c	Merge branch 'akpm' (Andrew's patch-bomb)	2012-03-28 17:19:28 -07:00
kfifo.c
kmod.c
kprobes.c
ksysfs.c
kthread.c
latencytop.c
lockdep_internals.h
lockdep_proc.c
lockdep_states.h
lockdep.c
Makefile
module.c	module: Remove module size limit	2012-03-26 12:50:53 +10:30
mutex-debug.c
mutex-debug.h
mutex.c
mutex.h
notifier.c
nsproxy.c
padata.c
panic.c
params.c
pid_namespace.c	pidns: add reboot_pid_ns() to handle the reboot syscall	2012-03-28 17:14:36 -07:00
pid.c
posix-cpu-timers.c
posix-timers.c
printk.c
profile.c
ptrace.c
range.c
rcu.h
rcupdate.c
rcutiny_plugin.h
rcutiny.c
rcutorture.c
rcutree_plugin.h
rcutree_trace.c
rcutree.c
rcutree.h
relay.c
res_counter.c
resource.c
rtmutex_common.h
rtmutex-debug.c
rtmutex-debug.h
rtmutex-tester.c
rtmutex.c
rtmutex.h
rwsem.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
seccomp.c
semaphore.c
signal.c	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
smp.c	smp: add func to IPI cpus based on parameter func	2012-03-28 17:14:35 -07:00
softirq.c
spinlock.c
srcu.c
stacktrace.c
stop_machine.c
sys_ni.c
sys.c	pidns: add reboot_pid_ns() to handle the reboot syscall	2012-03-28 17:14:36 -07:00
sysctl_binary.c
sysctl.c	Merge branch 'akpm' (Andrew's patch-bomb)	2012-03-28 17:19:28 -07:00
taskstats.c
test_kprobes.c
time.c
timeconst.pl
timer.c
tracepoint.c
tsacct.c
uid16.c
up.c
user_namespace.c
user-return-notifier.c
user.c
utsname_sysctl.c
utsname.c
wait.c
watchdog.c
workqueue_sched.h
workqueue.c