linux/drivers/infiniband/hw/nes
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
..
Kconfig RDMA/nes: Use LRO 2008-04-29 13:46:54 -07:00
Makefile RDMA/nes: Add a driver for NetEffect RNICs 2008-02-04 20:20:45 -08:00
nes_cm.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 2009-03-26 15:47:08 -07:00
nes_cm.h RDMA/nes: Handle MPA Reject message properly 2009-03-06 15:15:01 -08:00
nes_context.h RDMA/nes: Update copyright to new legal entity and year 2009-03-06 15:12:10 -08:00
nes_hw.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2009-03-26 15:54:36 -07:00
nes_hw.h RDMA/nes: Remove LLTX 2009-03-06 15:12:11 -08:00
nes_nic.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2009-03-26 15:54:36 -07:00
nes_user.h RDMA/nes: Update copyright to new legal entity and year 2009-03-06 15:12:10 -08:00
nes_utils.c RDMA/nes: Update copyright to new legal entity and year 2009-03-06 15:12:10 -08:00
nes_verbs.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 2009-03-26 15:47:08 -07:00
nes_verbs.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 2009-03-26 15:47:08 -07:00
nes.c RDMA/nes: Update copyright to new legal entity and year 2009-03-06 15:12:10 -08:00
nes.h RDMA/nes: Update copyright to new legal entity and year 2009-03-06 15:12:10 -08:00