diff options
| author |   Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /net/netrom/nr_out.c | |
| parent | Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream (diff) | |
| parent | Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32 (diff) | |
| download | linux-dev-f630fe2817601314b2eb7ca5ddc23c7834646731.tar.xz linux-dev-f630fe2817601314b2eb7ca5ddc23c7834646731.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'net/netrom/nr_out.c')
| -rw-r--r-- | net/netrom/nr_out.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/netrom/nr_out.c b/net/netrom/nr_out.c index 7939ded9c98c..0cbfb611465b 100644 --- a/net/netrom/nr_out.c +++ b/net/netrom/nr_out.c @@ -12,7 +12,6 @@ #include <linux/socket.h> #include <linux/in.h> #include <linux/kernel.h> -#include <linux/sched.h> #include <linux/timer.h> #include <linux/string.h> #include <linux/sockios.h> |