Merge commit 'v3.2-rc7' into x86/asm
authorIngo Molnar <mingo@elte.hu>
Wed, 4 Jan 2012 14:00:43 +0000 (15:00 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 4 Jan 2012 14:01:28 +0000 (15:01 +0100)
Merge reason: Update from -rc4 to -rc7.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
Documentation/kernel-parameters.txt

Simple merge