aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/utils.c
diff options
context:
space:
mode:
authorFelix Blyakher <felixb@sgi.com>2009-03-30 23:08:33 -0400
committerFelix Blyakher <felixb@sgi.com>2009-03-30 23:08:33 -0400
commit930861c4e6f13ce2e7d06cd1ef11441a065517d9 (patch)
treedf6ff01f89768ff8d6fe6a64491be30e6e56c3e0 /net/core/utils.c
parent8b112171734c791afaf43ccc8c6ec492e7006e44 (diff)
parent15f7176eb1cccec0a332541285ee752b935c1c85 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/core/utils.c')
-rw-r--r--net/core/utils.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/core/utils.c b/net/core/utils.c
index 72e0ebe964a0..83221aee7084 100644
--- a/net/core/utils.c
+++ b/net/core/utils.c
@@ -22,7 +22,6 @@
22#include <linux/net.h> 22#include <linux/net.h>
23#include <linux/string.h> 23#include <linux/string.h>
24#include <linux/types.h> 24#include <linux/types.h>
25#include <linux/random.h>
26#include <linux/percpu.h> 25#include <linux/percpu.h>
27#include <linux/init.h> 26#include <linux/init.h>
28#include <net/sock.h> 27#include <net/sock.h>