]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5d6a875 2d1f83e)
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 04:49:27 +0000 (15:49 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 04:49:27 +0000 (15:49 +1100)
commit50487cecae8c8a90631de70755dea3a5f8555f30
treeb08e27b31444080668edaabdc12f4ea615fcfe1ctree | snapshot
parent5d6a875498a84966069fc416485848d63bbffb18commit | diff
parent2d1f83edfaedddee8e12a3ec11e455a4d7fa7e4fcommit | diff
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
kernel/sched/fair.c
15 files changed:
Documentation/kernel-parameters.txt diff1 | diff2 | blob | history
Makefile diff1 | diff2 | blob | history
arch/arm/kernel/process.c diff1 | diff2 | blob | history
arch/x86/Kconfig diff1 | diff2 | blob | history
arch/x86/include/asm/thread_info.h diff1 | diff2 | blob | history
arch/x86/include/asm/topology.h diff1 | diff2 | blob | history
drivers/cpufreq/cpufreq_conservative.c diff1 | diff2 | blob | history
drivers/cpufreq/cpufreq_ondemand.c diff1 | diff2 | blob | history
drivers/macintosh/rack-meter.c diff1 | diff2 | blob | history
fs/proc/uptime.c diff1 | diff2 | blob | history
include/linux/sched.h diff1 | diff2 | blob | history
init/Kconfig diff1 | diff2 | blob | history
kernel/cpu.c diff1 | diff2 | blob | history
kernel/sched/core.c diff1 | diff2 | blob | history
kernel/sched/stats.h diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules