From bc83abc8f5024146667a9f4562393442b3b4055f Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Thu, 5 Apr 2012 14:39:10 +0000
Subject: [PATCH] --- yaml --- r: 298781 b: refs/heads/master c:
 93b6a3adbd159174772702744b142d60e3891dfa h: refs/heads/master i:   298779:
 8f108032def7020413701ff251b8ad61a99513d3 v: v3

---
 [refs]                                        | 2 +-
 trunk/Documentation/networking/netdevices.txt | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6e813772988e..75db24c812aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4f79e5cb2182f27d151da6e223186f287a615d6
+refs/heads/master: 93b6a3adbd159174772702744b142d60e3891dfa
diff --git a/trunk/Documentation/networking/netdevices.txt b/trunk/Documentation/networking/netdevices.txt
index 89358341682a..336fe8e85b20 100644
--- a/trunk/Documentation/networking/netdevices.txt
+++ b/trunk/Documentation/networking/netdevices.txt
@@ -54,8 +54,7 @@ dev->open:
 dev->stop:
 	Synchronization: rtnl_lock() semaphore.
 	Context: process
-	Note1: netif_running() is guaranteed false
-	Note2: dev->poll() is guaranteed to be stopped
+	Note: netif_running() is guaranteed false
 
 dev->do_ioctl:
 	Synchronization: rtnl_lock() semaphore.