]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'linus' into core/futexes
authorThomas Gleixner <tglx@linutronix.de>
Mon, 24 Nov 2008 18:54:37 +0000 (19:54 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 24 Nov 2008 18:54:37 +0000 (19:54 +0100)
1  2 
kernel/futex.c

diff --cc kernel/futex.c
Simple merge