]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'x86/cpufeature' into x86/urgent, to pick up pending Intel MID change
authorIngo Molnar <mingo@kernel.org>
Tue, 3 Nov 2015 11:00:40 +0000 (12:00 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 3 Nov 2015 11:00:40 +0000 (12:00 +0100)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge