[kernel/f21] Disable SERIAL_8250 on s390x (rhbz 1158848)

[Josh Boyer]

commit f843ae18fd8b83c271154574b33d0d7f303aefa3
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Wed Nov 19 13:24:16 2014 -0500

    Disable SERIAL_8250 on s390x (rhbz 1158848)

 config-s390x |    1 +
 kernel.spec  |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/config-s390x b/config-s390x
index f947234..78ba8e9 100644
--- a/config-s390x
+++ b/config-s390x
@@ -234,6 +234,7 @@ CONFIG_HOTPLUG_PCI_S390=y
 # CONFIG_HID is not set
 # CONFIG_MTD is not set
 
+# CONFIG_SERIAL_8250 is not set
 # CONFIG_PARPORT is not set
 # CONFIG_UWB is not set
 # CONFIG_MMC is not set
diff --git a/kernel.spec b/kernel.spec
index 48a4400..531a762 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2281,6 +2281,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Wed Nov 19 2014 Josh Boyer <jwboyer at fedoraproject.org>
+- Disable SERIAL_8250 on s390x (rhbz 1158848)
+
 * Fri Nov 14 2014 Josh Boyer <jwboyer at fedoraproject.org> - 3.17.3-300
 - Linux v3.17.3
 - Quiet WARN in i915 edp VDD handling