linux_old1/drivers/infiniband/hw/nes
Linus Torvalds 06f4e926d2 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: (1446 commits)
  macvlan: fix panic if lowerdev in a bond
  tg3: Add braces around 5906 workaround.
  tg3: Fix NETIF_F_LOOPBACK error
  macvlan: remove one synchronize_rcu() call
  networking: NET_CLS_ROUTE4 depends on INET
  irda: Fix error propagation in ircomm_lmp_connect_response()
  irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
  irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
  be2net: Kill set but unused variable 'req' in lancer_fw_download()
  irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
  atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
  rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
  pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
  isdn: capi: Use pr_debug() instead of ifdefs.
  tg3: Update version to 3.119
  tg3: Apply rx_discards fix to 5719/5720
  ...

Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
as per Davem.
2011-05-20 13:43:21 -07:00
..
Kconfig RDMA/nes: Update copyright and branding string 2009-12-09 15:21:56 -08:00
Makefile RDMA/nes: Add a driver for NetEffect RNICs 2008-02-04 20:20:45 -08:00
nes.c RDMA/nes: Don't print success message at level KERN_ERR 2011-03-18 08:52:30 -07:00
nes.h RDMA/nes: Fix SFP+ link down detection issue with switch port disable 2011-01-16 13:23:34 -08:00
nes_cm.c RDMA/iwcm: Get rid of enum iw_cm_event_status 2011-05-09 22:23:57 -07:00
nes_cm.h RDMA/nes: Fix crash in nes_accept() 2009-12-09 15:54:08 -08:00
nes_context.h RDMA/nes: Update copyright and branding string 2009-12-09 15:21:56 -08:00
nes_hw.c net: infiniband/hw/nes: convert to hw_features 2011-04-20 01:30:41 -07:00
nes_hw.h net: infiniband/hw/nes: convert to hw_features 2011-04-20 01:30:41 -07:00
nes_nic.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
nes_user.h RDMA/nes: Update copyright and branding string 2009-12-09 15:21:56 -08:00
nes_utils.c RDMA/nes: Store and print eeprom version 2010-07-28 15:12:38 -07:00
nes_verbs.c RDMA/iwcm: Get rid of enum iw_cm_event_status 2011-05-09 22:23:57 -07:00
nes_verbs.h RDMA/nes: Free kmap() resources 2009-12-09 15:54:28 -08:00