[kernel/f17] Move sch_htb module into main kernel package (rhbz 836185)

[Josh Boyer]

commit 4ecd7184ffc55955e1980269e6caf23d7bbd3a62
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Thu Jul 5 11:52:32 2012 -0400

    Move sch_htb module into main kernel package (rhbz 836185)

 kernel.spec    |    5 ++++-
 mod-extra.list |    1 -
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index dcdc27e..092ab79 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 4
+%global baserelease 5
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2412,6 +2412,9 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Thu Jul 05 2012 Josh Boyer <jwboyer at redhat.com>
+- Move sch_htb module into main kernel package (rhbz 836185)
+
 * Thu Jul  5 2012 Peter Robinson <pbrobinson at fedoraproject.org>
 - Enable OMAP freq scaling driver
 - Initial support for Beaglebone in OMAP kernel
diff --git a/mod-extra.list b/mod-extra.list
index a996033..84cbc4d 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -46,7 +46,6 @@ sch_drr.ko
 sch_dsmark.ko
 sch_gred.ko
 sch_hfsc.ko
-sch_htb.ko
 sch_ingress.ko
 sch_mqprio.ko
 sch_multiq.ko