From 1c8c6ccbd852c7d60c812b113a935e39444179e2 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Fri, 8 Oct 2010 10:33:39 -0700
Subject: [PATCH] --- yaml --- r: 214966 b: refs/heads/master c:
 4e7f79511e7332ae4056eda9156a0299511ea41e h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6cd84ef4c0cb..1c34b5e7f0d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b25ebfd21b03b3b59c1c7a7e0c597fd28286bb10
+refs/heads/master: 4e7f79511e7332ae4056eda9156a0299511ea41e
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index fd1b75a47e88..4962c8afd606 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -1576,8 +1576,8 @@ EXPORT_SYMBOL(netif_set_real_num_tx_queues);
  *
  *	This must be called either with the rtnl_lock held or before
  *	registration of the net device.  Returns 0 on success, or a
- *	negative error code.  If called before registration, it also
- *	sets the maximum number of queues, and always succeeds.
+ *	negative error code.  If called before registration, it always
+ *	succeeds.
  */
 int netif_set_real_num_rx_queues(struct net_device *dev, unsigned int rxq)
 {