]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cgroup/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 02:06:03 +0000 (12:06 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 02:06:03 +0000 (12:06 +1000)
commit0ba069b3e7bb38c9f760a164af2d86e957e745f7
tree0beb27b79043aea43498a80884f7c9ece8dde660
parentb100367eaf8fd7fcd634eb6529860468130f8597
parent86f82d561864e902c70282b6f17cf590c0f34691
Merge remote-tracking branch 'cgroup/for-next'

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