]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cputime/cputime'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 9 Nov 2011 01:10:36 +0000 (12:10 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 9 Nov 2011 01:10:36 +0000 (12:10 +1100)
commit376e2c9dd994ee7166d8e06404bd5a887290d051
treedd882ee3e65c6b97b03b32ab57c50d3fefa99380
parent22f1875beba658aaff3cefe56db623d5932bba67
parentf6116715d1bae43e37207ec9c9a8fa7185e6586c
Merge remote-tracking branch 'cputime/cputime'

Conflicts:
fs/proc/stat.c
include/asm-generic/cputime.h
kernel/sched_stats.h
14 files changed:
drivers/cpufreq/cpufreq_conservative.c
drivers/cpufreq/cpufreq_ondemand.c
drivers/cpufreq/cpufreq_stats.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