Merge branch 'tip/futex/devel' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorThomas Gleixner <tglx@linutronix.de>
Sat, 12 Mar 2011 10:37:14 +0000 (11:37 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Sat, 12 Mar 2011 10:43:32 +0000 (11:43 +0100)
 futex,plist: Pass the real head of the priority list to plist_del()
 futex,plist: Remove debug lock assignment from plist_node
 plist: Shrink struct plist_head
 plist: Add priority list test

1  2 
kernel/futex.c

diff --cc kernel/futex.c
Simple merge