Merge branch 'f17' of ssh://pkgs.fedoraproject.org/kernel into f17

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@redhat.com>
+- Move sch_htb module into main kernel package (rhbz 836185)
+
 * Thu Jul  5 2012 Peter Robinson <pbrobinson@fedoraproject.org>
 - Enable OMAP freq scaling driver
 - Initial support for Beaglebone in OMAP kernel

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