1
linux/drivers/net/mlx4
Linus Torvalds 13220a94d3 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: (1750 commits)
  ixgbe: Allow Priority Flow Control settings to survive a device reset
  net: core: remove unneeded include in net/core/utils.c.
  e1000e: update version number
  e1000e: fix close interrupt race
  e1000e: fix loss of multicast packets
  e1000e: commonize tx cleanup routine to match e1000 & igb
  netfilter: fix nf_logger name in ebt_ulog.
  netfilter: fix warning in ebt_ulog init function.
  netfilter: fix warning about invalid const usage
  e1000: fix close race with interrupt
  e1000: cleanup clean_tx_irq routine so that it completely cleans ring
  e1000: fix tx hang detect logic and address dma mapping issues
  bridge: bad error handling when adding invalid ether address
  bonding: select current active slave when enslaving device for mode tlb and alb
  gianfar: reallocate skb when headroom is not enough for fcb
  Bump release date to 25Mar2009 and version to 0.22
  r6040: Fix second PHY address
  qeth: fix wait_event_timeout handling
  qeth: check for completion of a running recovery
  qeth: unregister MAC addresses during recovery.
  ...

Manually fixed up conflicts in:
	drivers/infiniband/hw/cxgb3/cxio_hal.h
	drivers/infiniband/hw/nes/nes_nic.c
2009-03-26 15:54:36 -07:00
..
alloc.c
catas.c mlx4_core: Add link type autosensing 2009-03-18 19:45:11 -07:00
cmd.c
cq.c
en_cq.c
en_main.c
en_netdev.c
en_params.c
en_port.c
en_port.h
en_resources.c
en_rx.c
en_tx.c
eq.c mlx4_core: Add link type autosensing 2009-03-18 19:45:11 -07:00
fw.c
fw.h
icm.c
icm.h
intf.c
main.c mlx4_core: Add link type autosensing 2009-03-18 19:45:11 -07:00
Makefile mlx4_core: Add link type autosensing 2009-03-18 19:45:11 -07:00
mcg.c
mlx4_en.h
mlx4.h mlx4_core: Add link type autosensing 2009-03-18 19:45:11 -07:00
mr.c
pd.c
port.c mlx4_core: Don't perform SET_PORT command for Ethernet ports 2009-03-11 15:47:18 -07:00
profile.c
qp.c
reset.c
sense.c mlx4_core: Add link type autosensing 2009-03-18 19:45:11 -07:00
srq.c