Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 10 Jun 2008 09:22:26 +0000 (02:22 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 Jun 2008 09:22:26 +0000 (02:22 -0700)
commit65b53e4cc90e59936733b3b95b9451d2ca47528d
tree29932718192962671c48c3fd1ea017a6112459e8
parent788c0a53164c05c5ccdb1472474372b72ba74644
parent2e761e0532a784816e7e822dbaaece8c5d4be14d
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/tg3.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ieee80211_i.h
30 files changed:
drivers/net/Kconfig
drivers/net/atlx/atl1.c
drivers/net/myri10ge/myri10ge.c
drivers/net/tg3.c
drivers/net/ucc_geth_ethtool.c
drivers/net/wireless/airo.c
drivers/net/wireless/atmel.c
drivers/net/wireless/b43/b43.h
drivers/net/wireless/b43/main.c
drivers/net/wireless/b43legacy/main.c
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/libertas/cmd.c
drivers/net/wireless/libertas/main.c
drivers/net/wireless/rndis_wlan.c
drivers/net/wireless/rt2x00/rt2x00.h
drivers/net/wireless/rt2x00/rt2x00dev.c
drivers/net/wireless/rt2x00/rt2x00mac.c
drivers/net/wireless/zd1211rw/zd_mac.c
include/linux/pci_ids.h
include/net/sctp/structs.h
net/core/rtnetlink.c
net/mac80211/cfg.c
net/mac80211/ieee80211_i.h
net/mac80211/main.c
net/mac80211/mlme.c
net/mac80211/rx.c
net/mac80211/util.c
net/mac80211/wext.c
net/sctp/associola.c
net/sctp/protocol.c