]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'cgroup/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 13 Dec 2013 01:11:28 +0000 (12:11 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 13 Dec 2013 01:11:28 +0000 (12:11 +1100)
1  2 
kernel/sched/core.c
net/core/netprio_cgroup.c

Simple merge
Simple merge