Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 10 Sep 2010 05:27:33 +0000 (22:27 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 10 Sep 2010 05:27:33 +0000 (22:27 -0700)
commite548833df83c3554229eff0672900bfe958b45fd
tree85efc4a76dc356593d6d394776aeb845dc580fb6
parentcbd9da7be869f676afc204e1a664163778c770bd
parent053d8f6622701f849fda2ca2c9ae596c13599ba9
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
net/mac80211/main.c
38 files changed:
MAINTAINERS
drivers/firewire/net.c
drivers/net/3c59x.c
drivers/net/b44.c
drivers/net/benet/be.h
drivers/net/benet/be_ethtool.c
drivers/net/benet/be_main.c
drivers/net/niu.c
drivers/net/pcmcia/pcnet_cs.c
drivers/net/pxa168_eth.c
drivers/net/qlcnic/qlcnic_main.c
drivers/net/qlge/qlge_main.c
drivers/net/stmmac/stmmac_main.c
drivers/net/via-velocity.c
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/libertas/if_sdio.c
drivers/net/wireless/p54/txrx.c
drivers/usb/atm/cxacru.c
include/linux/pci_ids.h
include/net/sock.h
include/net/tcp.h
net/caif/cfrfml.c
net/core/dev.c
net/core/skbuff.c
net/ipv4/Kconfig
net/ipv4/route.c
net/ipv4/tcp.c
net/ipv4/tcp_timer.c
net/ipv4/udp.c
net/ipv6/netfilter/nf_conntrack_reasm.c
net/ipv6/reassembly.c
net/l2tp/l2tp_eth.c
net/mac80211/main.c
net/netfilter/ipvs/ip_vs_core.c
net/sctp/sm_statefuns.c
net/unix/af_unix.c
net/wireless/core.c
net/wireless/wext-core.c