]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cgroup/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 04:15:20 +0000 (15:15 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 04:15:20 +0000 (15:15 +1100)
commit3821092531aa2acf829f0e3d0039cd57af88486c
tree4fd750d7148bf7ad4521b2d585ec495753662b71
parent6886a4bec05e87901c4b48fe03bdbafacf9efebe
parent9e22840a819cd90f54748bd7133d2c9ca5abdf47
Merge remote-tracking branch 'cgroup/for-next'

Conflicts:
block/blk-cgroup.c
block/blk-cgroup.c
include/linux/sched.h
kernel/cpuset.c
kernel/events/core.c
kernel/fork.c
kernel/sched/core.c
kernel/signal.c
mm/memcontrol.c