diff --git a/[refs] b/[refs]
index 464378b526f1..c251c090b43c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50432cb534b566c4fd9e371fb37464a65ccd2391
+refs/heads/master: bb33808d282a48803dcb6070ee1547d221669114
diff --git a/trunk/Documentation/networking/netdevices.txt b/trunk/Documentation/networking/netdevices.txt
index 847cedb238f6..ce1361f95243 100644
--- a/trunk/Documentation/networking/netdevices.txt
+++ b/trunk/Documentation/networking/netdevices.txt
@@ -49,7 +49,7 @@ dev->hard_start_xmit:
 	for this and return -1 when the spin lock fails. 
 	The locking there should also properly protect against 
 	set_multicast_list
-	Context: BHs disabled
+	Context: Process with BHs disabled or BH (timer).
 	Notes: netif_queue_stopped() is guaranteed false
                Interrupts must be enabled when calling hard_start_xmit.
                 (Interrupts must also be enabled when enabling the BH handler.)