Merge branch 'linus' into core/locking
authorIngo Molnar <mingo@elte.hu>
Mon, 18 Oct 2010 16:43:43 +0000 (18:43 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 18 Oct 2010 16:43:46 +0000 (18:43 +0200)
Merge reason: Update to almost-final-.36

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge