Merge tag 'v3.12' into x86/cpu, to refresh the branch before queueing up more changes
authorIngo Molnar <mingo@kernel.org>
Wed, 6 Nov 2013 05:50:21 +0000 (06:50 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 6 Nov 2013 05:50:21 +0000 (06:50 +0100)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge