Merge pull request #1089 from crawford/kernel

coreos-kernel: bump to 3.18.6
This commit is contained in:
Alex Crawford 2015-02-11 11:45:18 -08:00
commit da7a281179
3 changed files with 2 additions and 1 deletions

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 3.18.4 Kernel Configuration
# Linux/x86 3.18.6 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@ -429,6 +429,7 @@ CONFIG_SCHED_MC=y
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
# CONFIG_PREEMPT is not set
CONFIG_X86_UP_APIC_MSI=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y