projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
[linux-2.6-block.git]
/
net
/
socket.c
diff --git
a/net/socket.c
b/net/socket.c
index 072e2e525ae6a783c79a02654436e04758e6b294..2c730fc718ab4f28f2135893ccd9683def86be78 100644
(file)
--- a/
net/socket.c
+++ b/
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>