tree 88e13187b64f8bfdea841c4a4476ac626e4eec28
parent fcd05809e1b2f64ece7a0b0bbe94ed29505cd2e0
parent 96fd4cd3e40e240f0c385af87f58e74da8b7099a
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1193350799 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1193350799 -0700

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

* '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