]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cputime/cputime'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Nov 2011 01:24:14 +0000 (12:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Nov 2011 01:24:14 +0000 (12:24 +1100)
commit48a81ab3a8bcf6769143e41e011ce888e9bba323
treee346ce771950fc1397d6be91929ed59c2c32be40
parent553fb1765b0359693a2bb8c8bd62be4ae0f13745
parentf6116715d1bae43e37207ec9c9a8fa7185e6586c
Merge remote-tracking branch 'cputime/cputime'

Conflicts:
fs/proc/stat.c
include/asm-generic/cputime.h
kernel/sched_stats.h
13 files changed:
drivers/cpufreq/cpufreq_conservative.c
drivers/cpufreq/cpufreq_ondemand.c
fs/proc/stat.c
include/asm-generic/cputime.h
include/linux/sched.h
kernel/cpu.c
kernel/exit.c
kernel/fork.c
kernel/posix-cpu-timers.c
kernel/sched.c
kernel/sched_stats.h
kernel/signal.c
kernel/sys.c