diff --git a/[refs] b/[refs]
index db693db4a529..1db44ad5a42b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01e123d79a23000f85c4cfb12a957908c0b2c3d8
+refs/heads/master: ede16af4cdbd21fa15d4178beb7c6fcbcccd07e9
diff --git a/trunk/net/sched/Kconfig b/trunk/net/sched/Kconfig
index 82adfe6447d7..9437b27ff84d 100644
--- a/trunk/net/sched/Kconfig
+++ b/trunk/net/sched/Kconfig
@@ -106,17 +106,6 @@ config NET_SCH_PRIO
 	  To compile this code as a module, choose M here: the
 	  module will be called sch_prio.
 
-config NET_SCH_RR
-	tristate "Multi Band Round Robin Queuing (RR)"
-	select NET_SCH_PRIO
-	---help---
-	  Say Y here if you want to use an n-band round robin packet
-	  scheduler.
-
-	  The module uses sch_prio for its framework and is aliased as
-	  sch_rr, so it will load sch_prio, although it is referred
-	  to using sch_rr.
-
 config NET_SCH_RED
 	tristate "Random Early Detection (RED)"
 	---help---