git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3e0ef9 07cde26)
Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip...
authorMartin Schwidefsky <schwidefsky@de.ibm.com>
Mon, 19 Dec 2011 18:23:15 +0000 (19:23 +0100)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Mon, 19 Dec 2011 18:23:15 +0000 (19:23 +0100)
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


Trivial merge
Pandora Kernel Repository