diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-07-06 07:22:05 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-07-06 07:22:05 +0200 |
commit | 003bacbdf7e20f8fdeea67a75192d18577a273da (patch) | |
tree | c193ea8b58ab2a4b681fccdfd99c6b229fa06386 /config-x86-generic | |
parent | 2c9c57c1c079a0736af9c31983d7815aee32a71b (diff) | |
parent | 19a6d8177021f28a9320215d72afc5bb269d8429 (diff) | |
download | kernel-003bacbdf7e20f8fdeea67a75192d18577a273da.tar.gz kernel-003bacbdf7e20f8fdeea67a75192d18577a273da.tar.xz kernel-003bacbdf7e20f8fdeea67a75192d18577a273da.zip |
Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc6.git0.1.vanilla.knurd.1.fc25kernel-4.7.0-0.rc6.git0.1.vanilla.knurd.1.fc24kernel-4.7.0-0.rc6.git0.1.vanilla.knurd.1.fc23kernel-4.7.0-0.rc6.git0.1.vanilla.knurd.1.fc22
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 ae80650a4..8ae20bab7 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -381,7 +381,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 |