Merge branch 'linus' into core/futexes
authorIngo Molnar <mingo@elte.hu>
Sat, 28 Mar 2009 22:24:12 +0000 (23:24 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 28 Mar 2009 22:24:12 +0000 (23:24 +0100)

Trivial merge