David S. Miller b26d344c6b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/caif/caif_hsi.c drivers/net/usb/qmi_wwan.c The qmi_wwan merge was trivial. The caif_hsi.c, on the other hand, was not. It's a conflict between 1c385f1fdf ("caif-hsi: Replace platform device with ops structure.") in the net-next tree and commit 39abbaef19 ("caif-hsi: Postpone init of HIS until open()") in the net tree. I did my best with that one and will ask Sjur to check it out. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-28 17:37:00 -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: use LLTX to avoid LOCKDEP splats	2012-06-26 16:42:33 -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