]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge branch 'x86/urgent' into x86/platform, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Wed, 1 Feb 2017 09:19:35 +0000 (10:19 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 1 Feb 2017 09:19:35 +0000 (10:19 +0100)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/kernel/apic/io_apic.c
drivers/platform/x86/Kconfig

Simple merge
Simple merge