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)
commitd7619fe39d9769b4d4545cc511c891deea18ae08
tree0a902533414001075b2245825e145cc2e35ce985
parent9ea71503a8ed9184d2d0b8ccc4d269d05f7940ae
parented8f37370d83e695c0a4fa5d5fc7a83ecb947526
Merge branch 'linus' into core/urgent
kernel/futex.c