Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

Browse source

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (48 commits)
  LIB82596: correct data types for hardware addresses
  via-velocity: don't oops on MTU change (resend)
  Stop phy code from returning success to unknown ioctls.
  SET_NETDEV_DEV() in fec_mpc52xx.c
  net: smc911x: only enable for mpr2 on sh.
  e1000: Fix NAPI state bug when Rx complete
  sky2: turn of dynamic Tx watermark workaround (FE+ only)
  sky2: don't use AER routines
  sky2: revert to access PCI config via device space
  cxgb - fix stats
  cxgb - fix NAPI
  cxgb - fix T2 GSO
  ucc_geth: handle passing of RX-only and TX-only internal delay PHY connection type parameters
  phylib: marvell: add support for TX-only and RX-only Internal Delay
  phylib: add PHY interface modes for internal delay for tx and rx only
  skge: MTU changing fix
  skge: serial mode register values
  skge version 1.13
  skge: increase TX threshold for Jumbo
  skge: fiber link up/down fix
  ...

...

This commit is contained in:

Linus Torvalds 2007-12-03 08:15:08 -08:00

parent d894f4510d 9ec46c6dae

commit e87cb5db0d

45 changed files with 443 additions and 414 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/net/Kconfig

View file

6

drivers/net/amd8111e.c

View file

2

drivers/net/bfin_mac.c

View file

72

drivers/net/chelsio/cxgb2.c → Executable file

View file

110

drivers/net/chelsio/pm3393.c → Executable file

View file

44

drivers/net/chelsio/sge.c → Executable file

View file

3

drivers/net/chelsio/sge.h → Executable file

View file

2

drivers/net/e1000/e1000_main.c

View file

2

drivers/net/ehea/ehea.h

View file

20

drivers/net/ehea/ehea_main.c

View file

4

drivers/net/ehea/ehea_qmr.h

View file

2

drivers/net/fec_mpc52xx.c

View file

38

drivers/net/forcedeth.c

View file

31

drivers/net/ibm_newemac/core.c

View file

1

drivers/net/ibm_newemac/core.h

View file

50

drivers/net/lib82596.c

View file

26

drivers/net/phy/marvell.c

View file

3

drivers/net/phy/phy.c

View file

32

drivers/net/s2io.c

View file

108

drivers/net/skge.c

View file

121

drivers/net/sky2.c

View file

21

drivers/net/sky2.h

View file

19

drivers/net/smc911x.c

View file

2

drivers/net/smc911x.h

View file

2

drivers/net/smc91x.h

View file

4

drivers/net/tulip/dmfe.c

View file

10

drivers/net/ucc_geth.c

View file

2

drivers/net/usb/dm9601.c

View file

11

drivers/net/via-velocity.c

View file

2

drivers/net/wireless/b43/main.c

View file

2

drivers/net/wireless/b43/phy.c

View file

2

drivers/net/wireless/b43legacy/dma.c

View file

2

drivers/net/wireless/b43legacy/main.c

View file

2

drivers/net/wireless/b43legacy/phy.c

View file

2

drivers/net/wireless/bcm43xx/bcm43xx_phy.c

View file

16

drivers/net/wireless/iwlwifi/iwl3945-base.c

View file

13

drivers/net/wireless/iwlwifi/iwl4965-base.c

View file

3

drivers/net/wireless/libertas/if_cs.c

View file

4

drivers/net/wireless/libertas/main.c

View file

2

drivers/net/wireless/libertas/wext.c

View file

2

drivers/net/wireless/netwave_cs.c

View file

2

drivers/net/wireless/p54usb.c

View file

45

drivers/s390/net/ctcmain.c

View file

4

include/linux/pci_ids.h

View file

2

include/linux/phy.h

View file