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
..
Kconfig	l2tp: Add debugfs files for dumping l2tp debug info	15 years ago
Makefile	l2tp: Add debugfs files for dumping l2tp debug info	15 years ago
l2tp_core.c	l2tp: fix potential rcu race	14 years ago
l2tp_core.h	l2tp: make local function static	14 years ago
l2tp_debugfs.c	l2tp: kzalloc with swapped params in l2tp_dfs_seq_open	14 years ago
l2tp_eth.c	l2tp: fix possible oops on l2tp_eth module unload	14 years ago
l2tp_ip.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	14 years ago
l2tp_netlink.c	l2tp: Fix set-but-unused variables.	14 years ago
l2tp_ppp.c	net: constify some ppp/pptp structs	15 years ago