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

2026-09-28 19:20:30 +00:00 · 2010-12-25 19:20:38 -08:00 · 2010-12-25 19:20:38 -08:00 · 041110a439
commit 041110a439
parent a1a5da57d0 2316aa2aee
36 changed files with 410 additions and 164 deletions
--- a/Documentation/networking/e100.txt
+++ b/Documentation/networking/e100.txt
--- a/Documentation/networking/e1000.txt
+++ b/Documentation/networking/e1000.txt
--- a/Documentation/networking/e1000e.txt
+++ b/Documentation/networking/e1000e.txt
--- a/Documentation/networking/igb.txt
+++ b/Documentation/networking/igb.txt
--- a/Documentation/networking/igbvf.txt
+++ b/Documentation/networking/igbvf.txt
--- a/Documentation/networking/ixgb.txt
+++ b/Documentation/networking/ixgb.txt
--- a/Documentation/networking/ixgbe.txt
+++ b/Documentation/networking/ixgbe.txt
--- a/drivers/net/e1000e/es2lan.c
+++ b/drivers/net/e1000e/es2lan.c
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/e1000e/phy.c
--- a/drivers/net/igb/e1000_82575.c
+++ b/drivers/net/igb/e1000_82575.c
--- a/drivers/net/igb/e1000_82575.h
+++ b/drivers/net/igb/e1000_82575.h
--- a/drivers/net/igb/e1000_hw.h
+++ b/drivers/net/igb/e1000_hw.h
--- a/drivers/net/igb/e1000_regs.h
+++ b/drivers/net/igb/e1000_regs.h
--- a/drivers/net/igb/igb.h
+++ b/drivers/net/igb/igb.h
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
--- a/drivers/net/igbvf/igbvf.h
+++ b/drivers/net/igbvf/igbvf.h
--- a/drivers/net/igbvf/netdev.c
+++ b/drivers/net/igbvf/netdev.c
--- a/drivers/net/igbvf/vf.c
+++ b/drivers/net/igbvf/vf.c
--- a/drivers/net/igbvf/vf.h
+++ b/drivers/net/igbvf/vf.h
--- a/drivers/net/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ixgbe/ixgbe_82599.c
--- a/drivers/net/ixgbe/ixgbe_common.c
+++ b/drivers/net/ixgbe/ixgbe_common.c
--- a/drivers/net/ixgbe/ixgbe_common.h
+++ b/drivers/net/ixgbe/ixgbe_common.h
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
--- a/drivers/net/ixgbe/ixgbe_mbx.c
+++ b/drivers/net/ixgbe/ixgbe_mbx.c
--- a/drivers/net/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ixgbe/ixgbe_sriov.c
--- a/drivers/net/ixgbe/ixgbe_type.h
+++ b/drivers/net/ixgbe/ixgbe_type.h
--- a/drivers/net/ixgbe/ixgbe_x540.c
+++ b/drivers/net/ixgbe/ixgbe_x540.c
--- a/drivers/net/ixgbevf/defines.h
+++ b/drivers/net/ixgbevf/defines.h
--- a/drivers/net/ixgbevf/ixgbevf.h
+++ b/drivers/net/ixgbevf/ixgbevf.h
--- a/drivers/net/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ixgbevf/ixgbevf_main.c
--- a/drivers/net/ixgbevf/vf.c
+++ b/drivers/net/ixgbevf/vf.c
--- a/drivers/net/ixgbevf/vf.h
+++ b/drivers/net/ixgbevf/vf.h