Merge commit 'v3.5-rc3' into x86/debug
authorIngo Molnar <mingo@kernel.org>
Wed, 20 Jun 2012 12:22:32 +0000 (14:22 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 20 Jun 2012 12:22:34 +0000 (14:22 +0200)
Merge it in to pick up a fix that we are going to clean up in this
branch.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge