]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 02:42:10 +0000 (13:42 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 02:42:10 +0000 (13:42 +1100)
commitdc8455b1dec3a6e4e4c4ac1d0305e7b63eecb327
tree13197aef3337b558fd06f3df180cfa1c338975e9
parent9ccd4bf8a228f3dd7d86bb8a9f9bf3bffddee54c
parente416e72660af37ea27486065a6edc257e7c38321
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
drivers/cpufreq/cpufreq_conservative.c
drivers/cpufreq/cpufreq_ondemand.c
drivers/macintosh/rack-meter.c
fs/proc/stat.c
fs/proc/uptime.c
kernel/sched/core.c
12 files changed:
Documentation/kernel-parameters.txt
MAINTAINERS
Makefile
arch/x86/Kconfig
arch/x86/include/asm/thread_info.h
arch/x86/include/asm/topology.h
drivers/cpufreq/cpufreq_conservative.c
drivers/cpufreq/cpufreq_ondemand.c
drivers/macintosh/rack-meter.c
include/linux/sched.h
kernel/sched/core.c
kernel/sched/stats.h