From 16239f14765230b8cefc63fe583fd331f11db98d Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Wed, 6 Jun 2012 15:23:37 +0000
Subject: [PATCH] --- yaml --- r: 313907 b: refs/heads/master c:
 94b6042cfed02229b05e04002ab00085b60f8213 h: refs/heads/master i:   313905:
 124025289350d90cf4642242974354a2da28cd88   313903:
 d8e8b52e1bb612d638bd2350710b329bf6fdfae6 v: v3

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

diff --git a/[refs] b/[refs]
index 1174fe08dad0..af56b3749a94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0bb79565aaa4d917a14c87deae8b98a61833307a
+refs/heads/master: 94b6042cfed02229b05e04002ab00085b60f8213
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index 016694d62484..1d74cea22aaa 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -160,8 +160,8 @@ static void skb_under_panic(struct sk_buff *skb, int sz, void *here)
  *	@node: numa node to allocate memory on
  *
  *	Allocate a new &sk_buff. The returned buffer has no headroom and a
- *	tail room of size bytes. The object has a reference count of one.
- *	The return is the buffer. On a failure the return is %NULL.
+ *	tail room of at least size bytes. The object has a reference count
+ *	of one. The return is the buffer. On a failure the return is %NULL.
  *
  *	Buffers may only be allocated from interrupts using a @gfp_mask of
  *	%GFP_ATOMIC.