Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 19 Apr 2011 07:21:33 +0000 (00:21 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 Apr 2011 07:21:33 +0000 (00:21 -0700)
commite1943424e43974f85b82bb31eaf832823bf49ce7
tree00a2dda7454ba186c0be4bfb8d08b7f74c3cd98c
parent88230fd586b4ccc5ffe6d6c2df8cdc495e89ad83
parent0553c891fabd287726b41076cfd03fe7e5ab596f
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/bnx2x/bnx2x_ethtool.c
15 files changed:
MAINTAINERS
drivers/net/bna/bfa_ioc.c
drivers/net/bna/bnad.c
drivers/net/bnx2x/bnx2x_ethtool.c
drivers/net/qlcnic/qlcnic.h
drivers/net/qlcnic/qlcnic_main.c
drivers/net/sfc/efx.c
drivers/net/sfc/net_driver.h
drivers/net/sfc/nic.c
drivers/net/sfc/nic.h
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/mac.c
drivers/net/wireless/ath/ath9k/recv.c
net/core/dev.c
net/ipv4/inet_connection_sock.c