diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-11-15 07:20:38 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-11-15 07:20:38 +0100 |
commit | a281c96353e5158f12161f9e88d556db977a9e58 (patch) | |
tree | ae696deda55d6b91571e92a5a38cf3f233b99d81 /config-x86-generic | |
parent | 54398d2622e81b77d652603e5bf217a7153fd2fb (diff) | |
parent | 30f2fba936c3d31baea9429b0c0f2ed7b0c4d897 (diff) | |
download | kernel-a281c96353e5158f12161f9e88d556db977a9e58.tar.gz kernel-a281c96353e5158f12161f9e88d556db977a9e58.tar.xz kernel-a281c96353e5158f12161f9e88d556db977a9e58.zip |
Merge remote-tracking branch 'origin/master'kernel-4.9.0-0.rc5.git0.1.vanilla.knurd.1.fc26kernel-4.9.0-0.rc5.git0.1.vanilla.knurd.1.fc25kernel-4.9.0-0.rc5.git0.1.vanilla.knurd.1.fc24kernel-4.9.0-0.rc5.git0.1.vanilla.knurd.1.fc23
Diffstat (limited to 'config-x86-generic')
-rw-r--r-- | config-x86-generic | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config-x86-generic b/config-x86-generic index 27163239a..fe51ba25d 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -380,7 +380,7 @@ CONFIG_SP5100_TCO=m # CONFIG_MEMTEST is not set # CONFIG_DEBUG_TLBFLUSH is not set -CONFIG_MAXSMP=y +# CONFIG_MAXSMP is not set CONFIG_HP_ILO=m |