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 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 2008-10-23 08:16:03 -07:00
catas.c mlx4_core: Add link type autosensing 2009-03-18 19:45:11 -07:00
cmd.c
cq.c mlx4_core: Add support for multiple completion event vectors 2008-12-22 07:15:03 -08:00
en_cq.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2008-12-28 12:49:40 -08:00
en_main.c mlx4_en: Always allocate RX ring for each interrupt vector 2008-12-29 18:38:54 -08:00
en_netdev.c netdev: missing validate_address hooks 2009-01-11 00:06:42 -08:00
en_params.c mlx4_en: Returning real Max in get_ringparam 2009-01-08 10:57:37 -08:00
en_port.c mlx4_en: Add driver for Mellanox ConnectX 10GbE NIC 2008-10-22 15:47:49 -07:00
en_port.h mlx4_en: Add driver for Mellanox ConnectX 10GbE NIC 2008-10-22 15:47:49 -07:00
en_resources.c mlx4_en: Add driver for Mellanox ConnectX 10GbE NIC 2008-10-22 15:47:49 -07:00
en_rx.c net: Add skb_record_rx_queue() calls to multiqueue capable drivers. 2009-01-27 16:22:32 -08:00
en_tx.c mlx4_en: Consider inline packets on completion 2009-01-08 10:57:15 -08:00
eq.c mlx4_core: Add link type autosensing 2009-03-18 19:45:11 -07:00
fw.c mlx4: Setting the correct offset for default mac address 2008-10-27 14:50:03 -04:00
fw.h mlx4_core: Multiple port type support 2008-10-22 15:38:42 -07:00
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: fix warning in drivers/net/mlx4/mcg.c 2008-11-25 16:57:59 -08:00
mlx4.h mlx4_core: Add link type autosensing 2009-03-18 19:45:11 -07:00
mlx4_en.h mlx4_en: Returning real Max in get_ringparam 2009-01-08 10:57:37 -08:00
mr.c mlx4_core: Support multiple pre-reserved QP regions 2008-10-22 10:25:29 -07:00
pd.c mlx4_core: Support multiple pre-reserved QP regions 2008-10-22 10:25:29 -07:00
port.c mlx4_core: Don't perform SET_PORT command for Ethernet ports 2009-03-11 15:47:18 -07:00
profile.c mlx4_core: Fix min() warning 2009-01-15 20:43:56 -08:00
qp.c mlx4_core: Support multiple pre-reserved QP regions 2008-10-22 10:25:29 -07:00
reset.c
sense.c mlx4_core: Add link type autosensing 2009-03-18 19:45:11 -07:00
srq.c mlx4_core: Support multiple pre-reserved QP regions 2008-10-22 10:25:29 -07:00