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
..
ib_addr.h	ethtool: Call ethtool's get/set_settings callbacks with cleaned data	2011-04-29 14:01:30 -07:00
ib_cache.h
ib_cm.h
ib_fmr_pool.h
ib_mad.h
ib_marshall.h
ib_pack.h
ib_sa.h
ib_smi.h
ib_umem.h
ib_user_cm.h
ib_user_mad.h
ib_user_sa.h
ib_user_verbs.h
ib_verbs.h	RDMA: Update workqueue usage	2011-01-16 21:16:31 -08:00
iw_cm.h	RDMA/iwcm: Get rid of enum iw_cm_event_status	2011-05-09 22:23:57 -07:00
Kbuild
rdma_cm_ib.h
rdma_cm.h	RDMA/cma: Add an ID_REUSEADDR option	2011-05-09 22:06:10 -07:00
rdma_user_cm.h	RDMA/cma: Add an ID_REUSEADDR option	2011-05-09 22:06:10 -07:00