Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	net/mac80211/main.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/firewire/net.c
Simple merge

diff --cc drivers/net/3c59x.c
Simple merge

diff --cc drivers/net/b44.c
Simple merge

diff --cc drivers/net/benet/be.h
Simple merge

diff --cc drivers/net/benet/be_ethtool.c
Simple merge

diff --cc drivers/net/benet/be_main.c
Simple merge

diff --cc drivers/net/niu.c
Simple merge

diff --cc drivers/net/pcmcia/pcnet_cs.c
Simple merge

diff --cc drivers/net/pxa168_eth.c
Simple merge

diff --cc drivers/net/qlcnic/qlcnic_main.c
Simple merge

diff --cc drivers/net/qlge/qlge_main.c
Simple merge

diff --cc drivers/net/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/via-velocity.c
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/base.c
Simple merge

diff --cc drivers/net/wireless/libertas/if_sdio.c
Simple merge

diff --cc drivers/net/wireless/p54/txrx.c
Simple merge

diff --cc drivers/usb/atm/cxacru.c
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc net/caif/cfrfml.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/ipv4/Kconfig
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv4/tcp_timer.c
Simple merge

diff --cc net/ipv4/udp.c
Simple merge

diff --cc net/ipv6/netfilter/nf_conntrack_reasm.c
Simple merge

diff --cc net/ipv6/reassembly.c
Simple merge

diff --cc net/l2tp/l2tp_eth.c
Simple merge

diff --cc net/mac80211/main.c
index a06b6ee63c07d7ac64f2440dba3fcf4b8fd40daa,ded5c3843e061a13e1d82be4666b746c829c467c..4935b843bcca31ecca7b198da5285a996bc9294f
--- 1/net/mac80211/main.c
--- 2/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@@ -850,7 -732,12 +850,13 @@@ void ieee80211_unregister_hw(struct iee
  
        rtnl_unlock();
  
+       /*
+        * Now all work items will be gone, but the
+        * timer might still be armed, so delete it
+        */
+       del_timer_sync(&local->work_timer);
+ 
 +      cancel_work_sync(&local->restart_work);
        cancel_work_sync(&local->reconfig_filter);
  
        ieee80211_clear_tx_pending(local);

diff --cc net/netfilter/ipvs/ip_vs_core.c
Simple merge

diff --cc net/sctp/sm_statefuns.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge

diff --cc net/wireless/core.c
Simple merge

diff --cc net/wireless/wext-core.c
Simple merge