]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitb2e7dd252d009e541e5f1641e71eb8ee9c017b40
tree05621c87b37e91c27b06d450d76adffe97ce9666
parentb61ae2f96add09b21ddcf760d2640efc6b0b3271
parentc27b1857e97994b8ca46636bbf29fd287ede59d9
Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into cputime-tip

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
drivers/cpufreq/cpufreq_conservative.c
drivers/cpufreq/cpufreq_ondemand.c
drivers/macintosh/rack-meter.c
fs/proc/uptime.c
include/linux/sched.h
kernel/sched/core.c
kernel/sched/stats.h