Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@kernel.org>
Sat, 25 Jan 2014 08:16:14 +0000 (09:16 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 25 Jan 2014 08:16:14 +0000 (09:16 +0100)
Merge in the x86 changes to apply a fix.

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

Trivial merge