Merge commit 'v2.6.26' into core/locking
authorIngo Molnar <mingo@elte.hu>
Mon, 14 Jul 2008 08:31:59 +0000 (10:31 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 14 Jul 2008 08:31:59 +0000 (10:31 +0200)

Trivial merge