]> xenbits.xensource.com Git - people/ssmith/netchannel2-pvops.git/commitdiff
Merge branch 'core/futexes' into auto-core-next
authorIngo Molnar <mingo@elte.hu>
Tue, 12 May 2009 07:02:59 +0000 (09:02 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 12 May 2009 07:02:59 +0000 (09:02 +0200)
1  2 
kernel/futex.c
kernel/rtmutex.c

diff --cc kernel/futex.c
Simple merge
Simple merge