Merge pull request #1278 from crawford/kernel

sys-kernel/coreos-{kernel-sources}: bump to v4.0.5
This commit is contained in:
Alex Crawford 2015-06-10 14:35:56 -07:00
commit d56992f819
3 changed files with 3 additions and 1 deletions

View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86 4.0.2 Kernel Configuration # Linux/x86 4.0.5 Kernel Configuration
# #
CONFIG_64BIT=y CONFIG_64BIT=y
CONFIG_X86_64=y CONFIG_X86_64=y
@ -1279,6 +1279,7 @@ CONFIG_NET_DROP_MONITOR=m
# CONFIG_AF_RXRPC is not set # CONFIG_AF_RXRPC is not set
CONFIG_FIB_RULES=y CONFIG_FIB_RULES=y
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
# CONFIG_WIMAX is not set # CONFIG_WIMAX is not set
# CONFIG_RFKILL is not set # CONFIG_RFKILL is not set
CONFIG_NET_9P=m CONFIG_NET_9P=m
@ -3725,6 +3726,7 @@ CONFIG_ENCRYPTED_KEYS=m
# CONFIG_SECURITY is not set # CONFIG_SECURITY is not set
CONFIG_SECURITYFS=y CONFIG_SECURITYFS=y
# CONFIG_INTEL_TXT is not set # CONFIG_INTEL_TXT is not set
# CONFIG_DEFAULT_SECURITY_SELINUX is not set
CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_DEFAULT_SECURITY_DAC=y
CONFIG_DEFAULT_SECURITY="" CONFIG_DEFAULT_SECURITY=""
CONFIG_XOR_BLOCKS=m CONFIG_XOR_BLOCKS=m