diff options
| author | Adam Williamson <awilliam@redhat.com> | 2014-08-25 09:45:47 -0700 |
|---|---|---|
| committer | Adam Williamson <awilliam@redhat.com> | 2014-08-25 09:48:26 -0700 |
| commit | 21e24125a9841c80745cc8f09d79323e1be44b3b (patch) | |
| tree | ac07b4c0c38a3620257fa682a09062942354bb20 /config-x86-generic | |
| parent | a1070754271ac1af0a318745de478f667c0610a8 (diff) | |
| parent | c7df1977f27d1459fc4fe5f0d31b37d58a0b4664 (diff) | |
| download | kernel-21e24125a9841c80745cc8f09d79323e1be44b3b.tar.gz kernel-21e24125a9841c80745cc8f09d79323e1be44b3b.tar.xz kernel-21e24125a9841c80745cc8f09d79323e1be44b3b.zip | |
Merge branch 'f21' into baytrail
Conflicts:
kernel-arm64.patch
kernel.spec
sources
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 375963229..d0e1dbd54 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -396,7 +396,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 |