linux/drivers/net/e1000e
Linus Torvalds 6ba74014c1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1443 commits)
  phy/marvell: add 88ec048 support
  igb: Program MDICNFG register prior to PHY init
  e1000e: correct MAC-PHY interconnect register offset for 82579
  hso: Add new product ID
  can: Add driver for esd CAN-USB/2 device
  l2tp: fix export of header file for userspace
  can-raw: Fix skb_orphan_try handling
  Revert "net: remove zap_completion_queue"
  net: cleanup inclusion
  phy/marvell: add 88e1121 interface mode support
  u32: negative offset fix
  net: Fix a typo from "dev" to "ndev"
  igb: Use irq_synchronize per vector when using MSI-X
  ixgbevf: fix null pointer dereference due to filter being set for VLAN 0
  e1000e: Fix irq_synchronize in MSI-X case
  e1000e: register pm_qos request on hardware activation
  ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twice
  net: Add getsockopt support for TCP thin-streams
  cxgb4: update driver version
  cxgb4: add new PCI IDs
  ...

Manually fix up conflicts in:
 - drivers/net/e1000e/netdev.c: due to pm_qos registration
   infrastructure changes
 - drivers/net/phy/marvell.c: conflict between adding 88ec048 support
   and cleaning up the IDs
 - drivers/net/wireless/ipw2x00/ipw2100.c: trivial ipw2100_pm_qos_req
   conflict (registration change vs marking it static)
2010-08-04 11:47:58 -07:00
..
82571.c e1000e: update copyright information 2010-06-18 22:12:18 -07:00
defines.h e1000e: update copyright information 2010-06-18 22:12:18 -07:00
e1000.h e1000e: Fix irq_synchronize in MSI-X case 2010-08-02 21:20:21 -07:00
es2lan.c e1000e: update copyright information 2010-06-18 22:12:18 -07:00
ethtool.c e1000e: fail when try to setup unsupported features 2010-06-29 00:53:25 -07:00
hw.h e1000e: correct MAC-PHY interconnect register offset for 82579 2010-08-03 16:40:53 -07:00
ich8lan.c e1000e: disable EEE support by default 2010-06-29 23:09:19 -07:00
lib.c e1000e: update copyright information 2010-06-18 22:12:18 -07:00
Makefile e1000e: reformat comment blocks, cosmetic changes only 2008-03-28 22:14:56 -04:00
netdev.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-08-04 11:47:58 -07:00
param.c e1000e: remove EEE module parameter 2010-06-29 23:09:19 -07:00
phy.c e1000e: update copyright information 2010-06-18 22:12:18 -07:00