diff --git a/[refs] b/[refs]
index 651cbabd150d..2a845e7523c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f5e0bffe59a27767e40753c8effd2357d5f68d3
+refs/heads/master: 3f5b98a2a0cba3351f96fcaa6d79aa1a0d93ee78
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index 98062e15dc3d..b9a7722c25dc 100644
--- a/trunk/Documentation/kernel-parameters.txt
+++ b/trunk/Documentation/kernel-parameters.txt
@@ -1579,9 +1579,6 @@ and is between 256 and 4096 characters. It is defined in the file
 	sa1100ir	[NET]
 			See drivers/net/irda/sa1100_ir.c.
 
-	sb=		[HW,OSS]
-			Format: <io>,<irq>,<dma>,<dma2>
-
 	sbni=		[NET] Granch SBNI12 leased line adapter
 
 	sc1200wdt=	[HW,WDT] SC1200 WDT (watchdog) driver