You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		14 years ago
..
Kbuild	[HEADERS] One line per header in Kbuild files to reduce conflicts	19 years ago
ib_addr.h	ethtool: Call ethtool's get/set_settings callbacks with cleaned data	14 years ago
ib_cache.h	RDMA: Improve include file coding style	17 years ago
ib_cm.h	trivial: fix typo "to to" in multiple files	16 years ago
ib_fmr_pool.h	RDMA: Improve include file coding style	17 years ago
ib_mad.h	Merge branches 'cxgb3', 'endian', 'ipath', 'ipoib', 'iser', 'mad', 'misc', 'mlx4', 'mthca', 'nes' and 'sysfs' into for-next	16 years ago
ib_marshall.h	RDMA/cma: Export rdma cm interface to userspace	18 years ago
ib_pack.h	IB/core: Add VLAN support for IBoE	14 years ago
ib_sa.h	RDMA/ucma: Add option to manually set IB path	15 years ago
ib_smi.h	IB: Remove __constant_{endian} uses	16 years ago
ib_umem.h	IB: expand ib_umem_get() prototype	17 years ago
ib_user_cm.h	RDMA: Improve include file coding style	17 years ago
ib_user_mad.h	RDMA: Improve include file coding style	17 years ago
ib_user_sa.h	RDMA/ucma: Add option to manually set IB path	15 years ago
ib_user_verbs.h	IB/uverbs: Return link layer type to userspace for query port operation	14 years ago
ib_verbs.h	RDMA: Update workqueue usage	14 years ago
iw_cm.h	RDMA/iwcm: Get rid of enum iw_cm_event_status	14 years ago
rdma_cm.h	RDMA/cma: Add an ID_REUSEADDR option	14 years ago
rdma_cm_ib.h	RDMA: Fix license text	17 years ago
rdma_user_cm.h	RDMA/cma: Add an ID_REUSEADDR option	14 years ago