Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Sun, 29 Nov 2009 08:57:15 +0000 (00:57 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 29 Nov 2009 08:57:15 +0000 (00:57 -0800)
commit9b963e5d0e01461099a40117b05480f24b63381f
tree4756d554e37bf4ab7202f2c564cbe629af98b576
parent3b8626ba01a8a745a3fdf22dd347edd708b0af13
parent5fdd4baef6195a1f2960e901c8877e2105f832ca
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/ieee802154/fakehard.c
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/phy.c
drivers/net/netxen/netxen_nic_init.c
drivers/net/wireless/ath/ath9k/main.c
24 files changed:
drivers/ieee802154/fakehard.c
drivers/net/Kconfig
drivers/net/au1000_eth.c
drivers/net/e1000e/e1000.h
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/netdev.c
drivers/net/e1000e/phy.c
drivers/net/ixgbe/ixgbe_main.c
drivers/net/macvlan.c
drivers/net/netxen/netxen_nic.h
drivers/net/netxen/netxen_nic_hdr.h
drivers/net/netxen/netxen_nic_hw.c
drivers/net/netxen/netxen_nic_main.c
drivers/net/stmmac/stmmac_main.c
drivers/net/veth.c
include/net/sctp/structs.h
net/core/pktgen.c
net/mac80211/agg-tx.c
net/mac80211/ieee80211_i.h
net/mac80211/util.c
net/rfkill/core.c
net/sctp/outqueue.c
net/sctp/sm_sideeffect.c
net/sctp/transport.c