From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 20 May 2009 07:02:28 +0000 (+0200)
Subject: Merge branch 'core/urgent' into core/futexes
X-Git-Tag: v2.6.31-rc1~409^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=521c180874dae86f675d23c4eade4dba8b1f2cc8;p=pandora-kernel.git

Merge branch 'core/urgent' into core/futexes

Merge reason: this branch was on an pre -rc1 base, merge it up to -rc6+
              to get the latest upstream fixes.

Conflicts:
	kernel/futex.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

521c180874dae86f675d23c4eade4dba8b1f2cc8
Reading git-diff-tree failed