Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2026-09-18 18:15:59 +00:00 · 2008-08-27 22:47:46 +10:00 · 2008-08-27 22:47:46 +10:00 · b18e30412d
commit b18e30412d
parent 09bf825e8e f2455eb176
52 changed files with 405 additions and 293 deletions
--- a/arch/powerpc/include/asm/cpm2.h
+++ b/arch/powerpc/include/asm/cpm2.h
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
--- a/drivers/net/gianfar.h
+++ b/drivers/net/gianfar.h
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
--- a/drivers/net/igb/e1000_82575.c
+++ b/drivers/net/igb/e1000_82575.c
--- a/drivers/net/igb/e1000_hw.h
+++ b/drivers/net/igb/e1000_hw.h
--- a/drivers/net/igb/igb_ethtool.c
+++ b/drivers/net/igb/igb_ethtool.c
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
--- a/drivers/net/skfp/ess.c
+++ b/drivers/net/skfp/ess.c
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
--- a/drivers/net/wd.c
+++ b/drivers/net/wd.c
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
--- a/drivers/net/wireless/ath5k/base.h
+++ b/drivers/net/wireless/ath5k/base.h
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
--- a/drivers/s390/net/ctcm_fsms.c
+++ b/drivers/s390/net/ctcm_fsms.c
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
--- a/drivers/s390/net/ctcm_main.h
+++ b/drivers/s390/net/ctcm_main.h
--- a/drivers/s390/net/ctcm_mpc.c
+++ b/drivers/s390/net/ctcm_mpc.c
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
--- a/drivers/s390/net/qeth_l3_sys.c
+++ b/drivers/s390/net/qeth_l3_sys.c
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
--- a/net/mac80211/debugfs_netdev.c
+++ b/net/mac80211/debugfs_netdev.c
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
--- a/net/rfkill/rfkill.c
+++ b/net/rfkill/rfkill.c
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c