From 212fdee85098bcae936f8dec9bd741b742c9f2ce Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Sat, 28 Mar 2009 23:38:40 -0700
Subject: [PATCH] --- yaml --- r: 139105 b: refs/heads/master c:
 4b21cd4eedff2123712c2132c8c6264d40332465 h: refs/heads/master i:   139103:
 8db4e371c276cbfdac801d46636981b7d63d8d01 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/skbuff.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b80d4bf71d63..ae8bc4162833 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79f1bc06dbb05f222756d6df4a9ff95588c9cc06
+refs/heads/master: 4b21cd4eedff2123712c2132c8c6264d40332465
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index bb1981fd60f3..eb2e837afaf3 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -168,6 +168,7 @@ struct skb_shared_hwtstamps {
  * @software:		generate software time stamp
  * @in_progress:	device driver is going to provide
  *			hardware time stamp
+ * @flags:		all shared_tx flags
  *
  * These flags are attached to packets as part of the
  * &skb_shared_info. Use skb_tx() to get a pointer.