Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 15 Feb 2010 06:30:54 +0000 (22:30 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 15 Feb 2010 06:30:54 +0000 (22:30 -0800)
commit5ecccb74dc91e22496a142b103ba958f93c29275
treeb560b8974ec0e0478492d60753d45d8aea9db9b0
parentf6f223039c0d0683bdea1eabd35b309e10311a60
parent3d0beb921fa34ebf8b13e206e5473329b14deb83
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
net/mac80211/rate.c
drivers/net/sfc/efx.c
drivers/net/sfc/qt202x_phy.c
drivers/net/via-velocity.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/iwlwifi/iwl-rx.c
drivers/net/wireless/iwmc3200wifi/rx.c
drivers/net/wireless/rtl818x/rtl8187_dev.c
net/ipv4/igmp.c
net/mac80211/rate.c