]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 03:36:58 +0000 (14:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 03:36:58 +0000 (14:36 +1100)
commit4485abdfef12aa31b9d24e978d066250c13d6fc7
tree86c123ee9032400d682e09e6056380f6d0a2cd4e
parentd93991bb04fde90477daec398c9640ef2da0c61c
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
14 files changed:
Documentation/kernel-parameters.txt
MAINTAINERS
Makefile
arch/x86/Kconfig
arch/x86/include/asm/thread_info.h
arch/x86/include/asm/topology.h
arch/x86/kernel/e820.c
arch/x86/platform/efi/efi.c
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