Merge commit 'v2.6.36' into kbuild/misc

Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).

1 files changed, 1 insertions, 0 deletions

diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
index 39f2dc943908..16ff29a7bb30 100644
--- a/include/net/inet_frag.h
+++ b/include/net/inet_frag.h
@@ -20,6 +20,7 @@ struct inet_frag_queue {
         atomic_t                refcnt;
         struct timer_list       timer;      /* when will this queue expire? */
         struct sk_buff          *fragments; /* list of received fragments */
+        struct sk_buff          *fragments_tail;
         ktime_t                 stamp;
         int                     len;        /* total length of orig datagram */
         int                     meat;