]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cgroup/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 02:42:07 +0000 (12:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 02:42:07 +0000 (12:42 +1000)
commit08e9db6542770899f746fa972580cb641caa2328
tree5a0b512911b3d665220a9c484044e1af9556234b
parentfe246145a6beee22f19e7a926956917f2a24a519
parent0d4dde1ac9a5af74ac76c6ab90557d1ae7b8f5d8
Merge remote-tracking branch 'cgroup/for-next'

Conflicts:
Documentation/feature-removal-schedule.txt
Documentation/feature-removal-schedule.txt
include/net/sock.h
kernel/cpuset.c
kernel/sched/core.c
mm/memcontrol.c
net/core/sock.c