]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 04:58:32 +0000 (15:58 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 04:58:32 +0000 (15:58 +1100)
commit3fa4b994b5ce62c53449d1e24916be25393aba0d
tree1c70d200823860e65b7c67711a3f4fd9baef4223
parent65a64dcd918ad1d55c63e90a9b59d61d9619984a
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