]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d754012 088f5f2)
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 03:20:00 +0000 (14:20 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 03:20:00 +0000 (14:20 +1100)
commita61c5654275a54272d8065ca2dbc21eddf3c8ac2
tree9ff4c6ede4eefac682a297ca3cec0b80894a5deetree | snapshot
parentd7540128c8f27b1a6851edbf14029b767e644fb6commit | diff
parent088f5f24ccef596026c6bfe43efbd78867f0c72ccommit | 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
Documentation/kernel-parameters.txt diff1 | diff2 | blob | history
MAINTAINERS 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
include/linux/sched.h 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