From 07ed418638b1f5d5e26746d0b07c7edc79575537 Mon Sep 17 00:00:00 2001
From: Jianjun Kong <jianjun@zeuux.org>
Date: Mon, 3 Nov 2008 18:23:09 -0800
Subject: [PATCH] --- yaml --- r: 121711 b: refs/heads/master c:
 ab2910921064b657610a3b501358a305e13087ea h: refs/heads/master i:   121709:
 4c4d2aba0254efd8c54d4bcd891ad23d2cf5f24c   121707:
 ef505282c5fceeecda909165d0a4afc871b992af   121703:
 d192842509cf9b206e7260d01bf2e2dcb06cb7ec   121695:
 919ae978627cb9b9b773ad6138c9e57200edb5a2 v: v3

---
 [refs]                    | 2 +-
 trunk/net/9p/trans_rdma.c | 1 -
 trunk/net/socket.c        | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d9cd3df5e7e6..46cdcce4a42d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d9f239a1edb31d6133230f478fd1dc2da338ec5
+refs/heads/master: ab2910921064b657610a3b501358a305e13087ea
diff --git a/trunk/net/9p/trans_rdma.c b/trunk/net/9p/trans_rdma.c
index 8d6cc4777aae..a7fe63f704d5 100644
--- a/trunk/net/9p/trans_rdma.c
+++ b/trunk/net/9p/trans_rdma.c
@@ -45,7 +45,6 @@
 #include <net/9p/transport.h>
 #include <rdma/ib_verbs.h>
 #include <rdma/rdma_cm.h>
-#include <rdma/ib_verbs.h>
 
 #define P9_PORT			5640
 #define P9_RDMA_SQ_DEPTH	32
diff --git a/trunk/net/socket.c b/trunk/net/socket.c
index 2b7a4b5c9b72..d23cdba10d7e 100644
--- a/trunk/net/socket.c
+++ b/trunk/net/socket.c
@@ -69,7 +69,6 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/mutex.h>
-#include <linux/thread_info.h>
 #include <linux/wanrouter.h>
 #include <linux/if_bridge.h>
 #include <linux/if_frad.h>