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)
commitf2f108eb4511f22a6f7568090cfcf4e7b2dc0f62
tree4b75771ec02543372808c7df31a1a65e37fdb361
parent756b0322e50aebc4b9afb4488a2d3f6c802b4e64
parent2b666ca4a68cbc22483b0f2e1ba3c0e59b01ae9e
Merge branch 'linus' into core/locking

Merge reason: Update to almost-final-.36

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