From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Mon, 19 Dec 2011 18:23:15 +0000 (+0100)
Subject: Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip... 
X-Git-Tag: v3.3-rc1~191^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=612ef28a045efadb3a98d4492ead7806a146485d;p=pandora-kernel.git

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
---

612ef28a045efadb3a98d4492ead7806a146485d
Reading git-diff-tree failed