]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'x86/platform'
authorIngo Molnar <mingo@kernel.org>
Tue, 14 Jan 2014 16:19:49 +0000 (17:19 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 14 Jan 2014 16:19:49 +0000 (17:19 +0100)
1  2 
arch/x86/Kconfig
arch/x86/kernel/Makefile

Simple merge
Simple merge