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)
commitadaf4ed2abbd285c93808060924eeec3af483aee
tree425c6c37c08af0b69efaa7457c9b428eda347c36
parentca3d30cc02f780f68771087040ce935add6ba2b7
parent5f0a6e2d503896062f641639dacfe5055c2f593b
Merge commit 'v3.2-rc7' into x86/asm

Merge reason: Update from -rc4 to -rc7.

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