From 1959b4bfbd4df0031f03897916ef6a66eb90d52f Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Sun, 20 Nov 2005 21:25:15 -0800
Subject: [PATCH] --- yaml --- r: 14573 b: refs/heads/master c:
 461ddf3b90bb149b99c3f675959c1bd6b11ed936 h: refs/heads/master i:   14571:
 7bb5d9fa14ad893972effeb28e7f7f946c39b643 v: v3

---
 [refs]                                      | 2 +-
 trunk/Documentation/DocBook/kernel-api.tmpl | 6 ++++--
 trunk/include/linux/skbuff.h                | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0203324c7066..4218d7436ef4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b84f4cc977ec4a1260dc8d9165efc9319a93c2a2
+refs/heads/master: 461ddf3b90bb149b99c3f675959c1bd6b11ed936
diff --git a/trunk/Documentation/DocBook/kernel-api.tmpl b/trunk/Documentation/DocBook/kernel-api.tmpl
index 096aed62c326..767433bdbc40 100644
--- a/trunk/Documentation/DocBook/kernel-api.tmpl
+++ b/trunk/Documentation/DocBook/kernel-api.tmpl
@@ -237,8 +237,10 @@ X!Ilib/string.c
      <sect1><title>Driver Support</title>
 !Enet/core/dev.c
 !Enet/ethernet/eth.c
-!Einclude/linux/etherdevice.h
-!Enet/core/wireless.c
+!Iinclude/linux/etherdevice.h
+<!-- FIXME: Removed for now since no structured comments in source
+X!Enet/core/wireless.c
+-->
      </sect1>
      <sect1><title>Synchronous PPP</title>
 !Edrivers/net/wan/syncppp.c
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index e797d9ef0e28..8c5d6001a923 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -206,6 +206,7 @@ enum {
  *	@nfct: Associated connection, if any
  *	@ipvs_property: skbuff is owned by ipvs
  *	@nfctinfo: Relationship of this skb to the connection
+ *	@nfct_reasm: netfilter conntrack re-assembly pointer
  *	@nf_bridge: Saved data about a bridged frame - see br_netfilter.c
  *	@tc_index: Traffic control index
  *	@tc_verd: traffic control verdict