]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'cputime/cputime'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 03:23:06 +0000 (14:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 03:23:06 +0000 (14:23 +1100)
1  2 
include/linux/sched.h
kernel/fork.c

Simple merge
diff --cc kernel/fork.c
Simple merge