1
linux/drivers/net/e1000e
Linus Torvalds 7a6362800c 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: (1480 commits)
  bonding: enable netpoll without checking link status
  xfrm: Refcount destination entry on xfrm_lookup
  net: introduce rx_handler results and logic around that
  bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag
  bonding: wrap slave state work
  net: get rid of multiple bond-related netdevice->priv_flags
  bonding: register slave pointer for rx_handler
  be2net: Bump up the version number
  be2net: Copyright notice change. Update to Emulex instead of ServerEngines
  e1000e: fix kconfig for crc32 dependency
  netfilter ebtables: fix xt_AUDIT to work with ebtables
  xen network backend driver
  bonding: Improve syslog message at device creation time
  bonding: Call netif_carrier_off after register_netdevice
  bonding: Incorrect TX queue offset
  net_sched: fix ip_tos2prio
  xfrm: fix __xfrm_route_forward()
  be2net: Fix UDP packet detected status in RX compl
  Phonet: fix aligned-mode pipe socket buffer header reserve
  netxen: support for GbE port settings
  ...

Fix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
with the staging updates.
2011-03-16 16:29:25 -07:00
..
82571.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 2011-01-14 13:25:30 -08:00
defines.h e1000e: disable jumbo frames on 82579 when MACsec enabled in EEPROM 2011-03-11 02:23:21 -08:00
e1000.h e1000e: convert to stats64 2011-01-24 00:13:37 -08:00
es2lan.c e1000e: update Copyright for 2011 2011-01-14 02:04:01 -08:00
ethtool.c e1000e: do not suggest the driver supports Wake-on-ARP 2011-03-11 02:24:15 -08:00
hw.h e1000e: magic number cleanup - ETH_ALEN 2011-03-11 01:52:40 -08:00
ich8lan.c e1000e: disable jumbo frames on 82579 when MACsec enabled in EEPROM 2011-03-11 02:23:21 -08:00
lib.c e1000e: reduce scope of some variables, remove unnecessary ones 2011-01-24 00:13:56 -08:00
Makefile e1000e: update Copyright for 2011 2011-01-14 02:04:01 -08:00
netdev.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-03-16 16:29:25 -07:00
param.c e1000e: consistent use of Rx/Tx vs. RX/TX/rx/tx in comments/logs 2011-01-14 02:06:23 -08:00
phy.c e1000e: reduce scope of some variables, remove unnecessary ones 2011-01-24 00:13:56 -08:00