From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 28 Oct 2008 15:54:49 +0000 (+0100)
Subject: Merge commit 'v2.6.28-rc2' into core/locking
X-Git-Tag: v2.6.29-rc1~572^2~4^4~4
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d1a76187a5be4f89c6cb19d800cb5fb7aac735c5;p=linux-2.6-omap-h63xx.git

Merge commit 'v2.6.28-rc2' into core/locking

Conflicts:
	arch/um/include/asm/system.h
---

d1a76187a5be4f89c6cb19d800cb5fb7aac735c5