linux-kernel-test/drivers/infiniband/hw/cxgb4
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
..
cm.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-03-16 16:29:25 -07:00
cq.c RDMA/cxgb4: Centralize the wait logic 2010-09-28 10:46:34 -07:00
device.c RDMA/cxgb4: Debugfs dump_qp() updates 2011-03-14 12:09:14 -07:00
ev.c RDMA/cxgb4: Handle CPL_RDMA_TERMINATE messages 2010-09-28 10:46:32 -07:00
iw_cxgb4.h RDMA/cxgb4: Remove db_drop_task 2011-03-14 12:09:10 -07:00
Kconfig Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
Makefile IB: Replace EXTRA_CFLAGS with ccflags-y 2010-10-23 13:45:03 -07:00
mem.c RDMA/cxgb4: Centralize the wait logic 2010-09-28 10:46:34 -07:00
provider.c RDMA/cxgb4: Export T4 TCP MIB 2010-10-22 21:57:26 -07:00
qp.c RDMA/cxgb4: Enable on-chip SQ support by default 2011-03-14 12:09:12 -07:00
resource.c RDMA/cxgb4: Support on-chip SQs 2010-09-28 10:46:35 -07:00
t4.h RDMA/cxgb4: Do CIDX_INC updates every 1/16 CQ depth CQE reaps 2011-03-14 12:09:11 -07:00
t4fw_ri_api.h RDMA/cxgb4: Add module option to tweak delayed ack 2010-07-21 10:53:52 -07:00
user.h RDMA/cxgb4: Support on-chip SQs 2010-09-28 10:46:35 -07:00