Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 375db481 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  gigaset: include cleanup cleanup
  packet : remove init_net restriction
  WAN: flush tx_queue in hdlc_ppp to prevent panic on rmmod hw_driver.
  ip: Fix ip_dev_loopback_xmit()
  net: dev_pick_tx() fix
  fib: suppress lockdep-RCU false positive in FIB trie.
  tun: orphan an skb on tx
  forcedeth: fix tx limit2 flag check
  iwlwifi: work around bogus active chains detection
parents 73c6c7fb b91ecb00

drivers/isdn/gigaset/bas-gigaset.c

+0 −5
Original line number Diff line number Diff line
@@ -14,11 +14,6 @@ 
 */



#include "gigaset.h"



#include <linux/errno.h>

#include <linux/init.h>

#include <linux/slab.h>

#include <linux/timer.h>

#include <linux/usb.h>

#include <linux/module.h>

#include <linux/moduleparam.h>

drivers/isdn/gigaset/capi.c

+0 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ 
 */



#include "gigaset.h"

#include <linux/slab.h>

#include <linux/ctype.h>

#include <linux/proc_fs.h>

#include <linux/seq_file.h>

#include <linux/isdn/capilli.h>

drivers/isdn/gigaset/common.c

+0 −2
Original line number Diff line number Diff line
@@ -14,10 +14,8 @@ 
 */



#include "gigaset.h"

#include <linux/ctype.h>

#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/slab.h>



/* Version Information */

#define DRIVER_AUTHOR "Hansjoerg Lipp <hjlipp@web.de>, Tilman Schmidt <tilman@imap.cc>, Stefan Eilers"

drivers/isdn/gigaset/gigaset.h

+1 −1
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ 
#include <linux/kernel.h>

#include <linux/compiler.h>

#include <linux/types.h>

#include <linux/ctype.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/usb.h>

#include <linux/skbuff.h>

#include <linux/netdevice.h>

#include <linux/ppp_defs.h>

drivers/isdn/gigaset/i4l.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 


#include "gigaset.h"

#include <linux/isdnif.h>

#include <linux/slab.h>



#define HW_HDR_LEN	2	/* Header size used to store ack info */