linux/include/rdma
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
..
ib_addr.h RDMA/addr: Keep pointer to netdevice in struct rdma_dev_addr 2008-07-14 23:48:53 -07:00
ib_cache.h RDMA: Improve include file coding style 2008-07-14 23:48:44 -07:00
ib_cm.h IB: Remove __constant_{endian} uses 2009-01-17 17:11:57 -08:00
ib_fmr_pool.h RDMA: Improve include file coding style 2008-07-14 23:48:44 -07:00
ib_mad.h Merge branches 'cxgb3', 'endian', 'ipath', 'ipoib', 'iser', 'mad', 'misc', 'mlx4', 'mthca', 'nes' and 'sysfs' into for-next 2009-03-24 20:44:41 -07:00
ib_marshall.h RDMA/cma: Export rdma cm interface to userspace 2006-12-12 11:50:22 -08:00
ib_pack.h RDMA: Improve include file coding style 2008-07-14 23:48:44 -07:00
ib_sa.h RDMA: Improve include file coding style 2008-07-14 23:48:44 -07:00
ib_smi.h IB: Remove __constant_{endian} uses 2009-01-17 17:11:57 -08:00
ib_umem.h IB: expand ib_umem_get() prototype 2008-04-29 08:06:12 -07:00
ib_user_cm.h RDMA: Improve include file coding style 2008-07-14 23:48:44 -07:00
ib_user_mad.h RDMA: Improve include file coding style 2008-07-14 23:48:44 -07:00
ib_user_sa.h
ib_user_verbs.h RDMA/core: Add memory management extensions support 2008-07-14 23:48:45 -07:00
ib_verbs.h net: replace __constant_{endian} uses in net headers 2009-02-14 22:58:35 -08:00
iw_cm.h RDMA: Improve include file coding style 2008-07-14 23:48:44 -07:00
Kbuild
rdma_cm_ib.h RDMA: Fix license text 2008-07-14 23:48:43 -07:00
rdma_cm.h RDMA/cma: Remove padding arrays by using struct sockaddr_storage 2008-08-04 11:02:14 -07:00
rdma_user_cm.h RDMA/cma: add support for rdma_migrate_id() 2008-01-25 14:15:32 -08:00