Merge remote-tracking branch 'cputime/cputime'

author Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 29 Nov 2011 01:53:12 +0000 (12:53 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 29 Nov 2011 01:53:12 +0000 (12:53 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 01:53:12 +0000 (12:53 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 01:53:12 +0000 (12:53 +1100)
diff --cc include/linux/sched.h
Simple merge
diff --cc kernel/fork.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 29 Nov 2011 01:53:12 +0000 (12:53 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 29 Nov 2011 01:53:12 +0000 (12:53 +1100)
		1	2
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	patch \|	diff1 \|	diff2 \|	blob \| history