Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 00:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
b97c5c7e6c
linux/drivers/net/arcnet
History
Linus Torvalds a319a2773a Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (217 commits)
  net/ieee80211: fix more crypto-related build breakage
  [PATCH] Spidernet: add ethtool -S (show statistics)
  [NET] GT96100: Delete bitrotting ethernet driver
  [PATCH] mv643xx_eth: restrict to 32-bit PPC_MULTIPLATFORM
  [PATCH] Cirrus Logic ep93xx ethernet driver
  r8169: the MMIO region of the 8167 stands behin BAR#1
  e1000, ixgb: Remove pointless wrappers
  [PATCH] Remove powerpc specific parts of 3c509 driver
  [PATCH] s2io: Switch to pci_get_device
  [PATCH] gt96100: move to pci_get_device API
  [PATCH] ehea: bugfix for register access functions
  [PATCH] e1000 disable device on PCI error
  drivers/net/phy/fixed: #if 0 some incomplete code
  drivers/net: const-ify ethtool_ops declarations
  [PATCH] ethtool: allow const ethtool_ops
  [PATCH] sky2: big endian
  [PATCH] sky2: fiber support
  [PATCH] sky2: tx pause bug fix
  drivers/net: Trim trailing whitespace
  [PATCH] ehea: IBM eHEA Ethernet Device Driver
  ...

Manually resolved conflicts in drivers/net/ixgb/ixgb_main.c and
drivers/net/sky2.c related to CHECKSUM_HW/CHECKSUM_PARTIAL changes by
commit 84fa7933a3 that just happened to be
next to unrelated changes in this update.
2006-09-24 10:15:13 -07:00
..
arc-rawmode.c [PATCH] drivers/net/arcnet/: possible cleanups 2006-01-17 08:38:12 -05:00
arc-rimi.c [PATCH] arcnet probing cleanups and fixes 2006-01-28 21:42:11 -05:00
arcnet.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
capmode.c [PATCH] make some things static 2005-05-05 16:36:47 -07:00
com90io.c [PATCH] Remove unnecessary check_region references in comments 2005-09-13 08:22:29 -07:00
com90xx.c [NET]: com90xx kmalloc fix 2006-04-01 00:49:35 -08:00
com20020-isa.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
com20020-pci.c Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 2006-09-24 10:15:13 -07:00
com20020.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Kconfig [PATCH] trivial: fix spelling errors in Kconfigs 2006-02-17 08:16:59 -05:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
rfc1051.c [PATCH] drivers/net/arcnet/: possible cleanups 2006-01-17 08:38:12 -05:00
rfc1201.c [PATCH] drivers/net/arcnet/: possible cleanups 2006-01-17 08:38:12 -05:00