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:
  [netdrvr] forcedeth: add MCP77 device IDs
  rndis_host: reduce MTU instead of refusing to talk to devices with low max packet size
  cpmac: update to new fixed phy driver interface
  cpmac: convert to napi_struct interface
  cpmac: use print_mac() instead of MAC_FMT
  natsemi: fix oops, link back netdevice from private-struct
  ehea: fix port_napi_disable/enable
  bonding/bond_main.c: fix cut'n'paste error
  make bonding/bond_main.c:bond_deinit() static
  drivers/net/ipg.c: cleanups
  remove Documentation/networking/net-modules.txt

...

This commit is contained in:

Linus Torvalds 2007-10-25 15:19:59 -07:00

parent fcd05809e1 96fd4cd3e4

commit 2304c3ac36

13 changed files with 149 additions and 409 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

2

Documentation/networking/00-INDEX

View file

315

Documentation/networking/net-modules.txt

View file

5

drivers/net/bonding/bond_main.c

View file

1

drivers/net/bonding/bonding.h

View file

145

drivers/net/cpmac.c

View file

2

drivers/net/ehea/ehea.h

View file

7

drivers/net/ehea/ehea_main.c

View file

16

drivers/net/forcedeth.c

View file

22

drivers/net/ipg.c

View file

20

drivers/net/ipg.h

View file

1

drivers/net/natsemi.c

View file

18

drivers/net/usb/rndis_host.c

View file

4

include/linux/pci_ids.h

View file