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)
commit612ef28a045efadb3a98d4492ead7806a146485d
tree05621c87b37e91c27b06d450d76adffe97ce9666
parentc3e0ef9a298e028a82ada28101ccd5cf64d209ee
parent07cde2608a3b5c66515363f1b53623b1536b9785
Merge branch 'sched/core' of git://git./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