]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'workqueues/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 03:46:23 +0000 (14:46 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 03:46:23 +0000 (14:46 +1100)
1  2 
include/linux/device.h
include/linux/sched.h
kernel/cgroup.c
kernel/cpuset.c
kernel/sched/core.c

Simple merge
Simple merge
diff --cc kernel/cgroup.c
Simple merge
diff --cc kernel/cpuset.c
Simple merge
Simple merge