David S. Miller 43b03f1f6d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: MAINTAINERS drivers/net/wireless/iwlwifi/pcie/trans.c The iwlwifi conflict was resolved by keeping the code added in 'net' that turns off the buggy chip feature. The MAINTAINERS conflict was merely overlapping changes, one change updated all the wireless web site URLs and the other changed some GIT trees to be Johannes's instead of John's. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-12 21:59:18 -07:00
..
Kconfig	l2tp: Add debugfs files for dumping l2tp debug info	2010-04-03 14:56:07 -07:00
l2tp_core.c	net: l2tp: Standardize logging styles	2012-05-17 04:34:38 -04:00
l2tp_core.h	net: l2tp: Standardize logging styles	2012-05-17 04:34:38 -04:00
l2tp_debugfs.c	net: l2tp: Standardize logging styles	2012-05-17 04:34:38 -04:00
l2tp_eth.c	net: l2tp_eth: fix kernel panic on rmmod l2tp_eth	2012-06-07 13:02:20 -07:00
l2tp_ip6.c	l2tp: fix oops in L2TP IP sockets for connect() AF_UNSPEC case	2012-05-29 17:19:44 -04:00
l2tp_ip.c	l2tp: fix a race in l2tp_ip_sendmsg()	2012-06-08 14:30:51 -07:00
l2tp_netlink.c	genetlink: Build a generic netlink family module alias	2012-05-29 22:33:56 -04:00
l2tp_ppp.c	net: Remove casts to same type	2012-06-04 11:45:11 -04:00
Makefile	l2tp: introduce L2TPv3 IP encapsulation support for IPv6	2012-05-01 09:30:55 -04:00