linux/drivers/net/ibm_emac
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
..
Makefile [PATCH] New PowerPC 4xx on-chip ethernet controller driver 2005-10-28 16:42:01 -04:00
ibm_emac.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ibm_emac_core.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
ibm_emac_core.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ibm_emac_debug.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ibm_emac_debug.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ibm_emac_mal.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ibm_emac_mal.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ibm_emac_phy.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ibm_emac_phy.h [PATCH] New PowerPC 4xx on-chip ethernet controller driver 2005-10-28 16:42:01 -04:00
ibm_emac_rgmii.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ibm_emac_rgmii.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ibm_emac_tah.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ibm_emac_tah.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ibm_emac_zmii.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ibm_emac_zmii.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00