[kernel/f17] Move modules needed by Shorewall back to main kernel package (rhbz 844436)

[Josh Boyer]

commit 66cb0c0021d40de9b191febc4c3893bbdcf941b3
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Tue Jul 31 08:03:58 2012 -0400

    Move modules needed by Shorewall back to main kernel package (rhbz 844436)

 kernel.spec    |    5 ++++-
 mod-extra.list |    5 -----
 2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index f1a2729..9f99123 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 2
+%global baserelease 3
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2336,6 +2336,9 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Tue Jul 31 2012 Josh Boyer <jwboyer at redhat.com>
+- Move modules needed by Shorewall back to main kernel package (rhbz 844436)
+
 * Thu Jul 26 2012 Josh Boyer <jwboyer at redhat.com> - 3.5.0-2
 - Add patch series queued for 3.5.1
 
diff --git a/mod-extra.list b/mod-extra.list
index 84cbc4d..293e192 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -45,17 +45,12 @@ sch_choke.ko
 sch_drr.ko
 sch_dsmark.ko
 sch_gred.ko
-sch_hfsc.ko
-sch_ingress.ko
 sch_mqprio.ko
 sch_multiq.ko
 sch_netem.ko
-sch_prio.ko
 sch_qfq.ko
 sch_red.ko
 sch_sfb.ko
-sch_sfq.ko
-sch_tbf.ko
 sch_teql.ko
 ax25.ko
 netrom.ko