-
git://git.linaro.org/people/jstultz/linux由 Thomas Gleixner 提交于
Trivial conflict in arch/x86/Kconfig Signed-off-by: NThomas Gleixner <tglx@linutronix.de>90889a63
Trivial conflict in arch/x86/Kconfig
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>