Merge branch 'linus' into core/urgent
authorIngo Molnar <mingo@elte.hu>
Thu, 4 Aug 2011 07:09:27 +0000 (09:09 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 4 Aug 2011 07:09:27 +0000 (09:09 +0200)
1  2 
kernel/futex.c

diff --cc kernel/futex.c
Simple merge