Merge commit 'linus' into x86/urgent, to pick up recent x86 changes
authorIngo Molnar <[email protected]>
Tue, 12 Jan 2016 10:08:13 +0000 (11:08 +0100)
committerIngo Molnar <[email protected]>
Tue, 12 Jan 2016 10:08:13 +0000 (11:08 +0100)
Signed-off-by: Ingo Molnar <[email protected]>

Trivial merge