Merge commit 'v2.6.34-rc6' into core/locking
authorIngo Molnar <mingo@elte.hu>
Mon, 3 May 2010 07:17:01 +0000 (09:17 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 3 May 2010 07:17:01 +0000 (09:17 +0200)

Trivial merge