From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 15 Mar 2010 07:17:33 +0000 (+0100)
Subject: Merge branch 'linus' into timers/core
X-Git-Tag: v2.6.35-rc1~492^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12b8aeee3e51654fb95a3baff2e093f2513bb87d;p=pandora-kernel.git

Merge branch 'linus' into timers/core

Conflicts:
	Documentation/feature-removal-schedule.txt

Merge reason: Resolve the conflict, update to upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

12b8aeee3e51654fb95a3baff2e093f2513bb87d
Reading git-diff-tree failed