tree f2cb778036dbfcade394c9e5ad94a69137fd352c
parent 73c6c7fbb74d07a80fee41ce4ca3976547519e42
parent b91ecb0027c7171c83d7cf443a22c39b1fde6d83
author Linus Torvalds <torvalds@linux-foundation.org> 1271687265 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1271687265 -0700

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