]> 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, 7 Dec 2011 03:59:37 +0000 (14:59 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 04:01:40 +0000 (15:01 +1100)
commita6840db71541a0669bcb01a3d9e51be6af77bbdf
tree5706bab4d998b3776b96d79c80d31a856c5ba329
parent230839fad4912e64f213bf0774e902631dba24c9
parent3b1be9514ed4e9b355f8c776f2f27937bb4853b7
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
Documentation/kernel-parameters.txt
MAINTAINERS
arch/x86/Kconfig
arch/x86/include/asm/thread_info.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