tree 05621c87b37e91c27b06d450d76adffe97ce9666
parent c3e0ef9a298e028a82ada28101ccd5cf64d209ee
parent 07cde2608a3b5c66515363f1b53623b1536b9785
author Martin Schwidefsky <schwidefsky@de.ibm.com> 1324318995 +0100
committer Martin Schwidefsky <schwidefsky@de.ibm.com> 1324318995 +0100

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