Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 27 Nov 2008 07:48:40 +0000 (23:48 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 27 Nov 2008 07:48:40 +0000 (23:48 -0800)
commit5b9ab2ec04ec1e1e53939768805612ac191d7ba2
tree22d29905c148d2d743b3eccb585fbe60fb91e25a
parent851fd7bd88524bb4e20f3def3127cd9167d6d0cf
parent3ec192559033ed457f0d7856838654c100fc659f
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/hp-plus.c
drivers/net/wireless/ath5k/base.c
drivers/net/wireless/ath9k/recv.c
net/wireless/reg.c
20 files changed:
drivers/net/Makefile
drivers/net/chelsio/sge.c
drivers/net/e1000e/netdev.c
drivers/net/hp-plus.c
drivers/net/igb/igb_main.c
drivers/net/ixgbe/ixgbe_main.c
drivers/net/pcmcia/axnet_cs.c
drivers/net/pcmcia/pcnet_cs.c
drivers/net/phy/phy_device.c
drivers/net/sis900.c
drivers/net/sungem.c
drivers/net/wireless/ath5k/base.c
drivers/net/wireless/ath9k/beacon.c
drivers/net/wireless/ath9k/recv.c
drivers/net/wireless/iwlwifi/iwl-agn.c
net/bridge/br_netfilter.c
net/core/skbuff.c
net/core/sock.c
net/ipv4/tcp_output.c
net/mac80211/wext.c