linux/drivers/net/phy
Linus Torvalds 597d8c7178 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (56 commits)
  sky2: Fix oops in sky2_xmit_frame() after TX timeout
  Documentation/3c509: document ethtool support
  af_packet: Don't use skb after dev_queue_xmit()
  vxge: use pci_dma_mapping_error to test return value
  netfilter: ebtables: enforce CAP_NET_ADMIN
  e1000e: fix and commonize code for setting the receive address registers
  e1000e: e1000e_enable_tx_pkt_filtering() returns wrong value
  e1000e: perform 10/100 adaptive IFS only on parts that support it
  e1000e: don't accumulate PHY statistics on PHY read failure
  e1000e: call pci_save_state() after pci_restore_state()
  netxen: update version to 4.0.72
  netxen: fix set mac addr
  netxen: fix smatch warning
  netxen: fix tx ring memory leak
  tcp: update the netstamp_needed counter when cloning sockets
  TI DaVinci EMAC: Handle emac module clock correctly.
  dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips
  ixgbe: Fix compiler warning about variable being used uninitialized
  netfilter: nf_ct_ftp: fix out of bounds read in update_nl_seq()
  mv643xx_eth: don't include cache padding in rx desc buffer size
  ...

Fix trivial conflict in drivers/scsi/cxgb3i/cxgb3i_offload.c
2010-01-12 20:53:29 -08:00
..
bcm63xx.c MIPS: BCM63XX: Add integrated ethernet PHY support for phylib. 2009-07-07 19:23:51 -07:00
broadcom.c broadcom: Fix &&/|| confusion in bcm54xx_adjust_rxrefclk() 2010-01-03 22:01:32 -08:00
cicada.c
davicom.c
et1011c.c
fixed.c phy: error handling for platform_device_register_simple() 2009-04-11 01:52:29 -07:00
icplus.c
Kconfig NET: Add driver for Octeon MDIO buses. 2009-12-17 01:56:58 +00:00
lxt.c
Makefile NET: Add driver for Octeon MDIO buses. 2009-12-17 01:56:58 +00:00
marvell.c phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs 2009-09-11 12:54:38 -07:00
mdio_bus.c phylib: Properly reinitialize PHYs after hibernation 2009-12-30 22:03:42 -08:00
mdio-bitbang.c
mdio-gpio.c net: fix mdio section mismatch warning 2009-11-17 04:04:40 -08:00
mdio-octeon.c NET: Add driver for Octeon MDIO buses. 2009-12-17 01:56:58 +00:00
national.c
phy_device.c phylib: Properly reinitialize PHYs after hibernation 2009-12-30 22:03:42 -08:00
phy.c drivers/net: Move && and || to end of previous line 2009-12-03 13:18:01 -08:00
qsemi.c
realtek.c
smsc.c phy: add new LAN8710 and LAN8720 device ids to smsc phy driver 2009-03-23 15:17:31 -07:00
ste10Xp.c
vitesse.c