From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 12 Dec 2008 12:48:57 +0000 (+0100)
Subject: Merge branch 'sched/core' into cpus4096
X-Git-Tag: v2.6.29-rc1~538^2~27
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45ab6b0c76d0e4cce5bd608ccf97b0f6b20f18df;p=pandora-kernel.git

Merge branch 'sched/core' into cpus4096

Conflicts:
	include/linux/ftrace.h
	kernel/sched.c
---

45ab6b0c76d0e4cce5bd608ccf97b0f6b20f18df
Reading git-diff-tree failed