Thomas Gleixner 521c180874 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>

2009-05-20 09:02:28 +02:00

..

asm

Merge branch 'core/urgent' into core/futexes

2009-05-20 09:02:28 +02:00