David S. Miller d4185bbf62 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

Minor conflict between the BCM_CNIC define removal in net-next
and a bug fix added to net.  Based upon a conflict resolution
patch posted by Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>

2012-11-10 18:32:51 -05:00

..

Kconfig

l2tp: fix compile error when CONFIG_IPV6=m and CONFIG_L2TP=y

2012-09-21 12:06:46 -04:00

l2tp_core.c

l2tp: fix a lockdep splat

2012-09-04 14:07:50 -04:00

l2tp_core.h

l2tp: avoid to use synchronize_rcu in tunnel free function

2012-08-30 12:31:03 -04:00

l2tp_debugfs.c

net: l2tp: Standardize logging styles

2012-05-17 04:34:38 -04:00

l2tp_eth.c

l2tp: fix oops in l2tp_eth_create() error path

2012-11-02 21:56:35 -04:00

l2tp_ip6.c

l2tp: fix info leak via getsockname()

2012-08-15 21:36:31 -07:00

l2tp_ip.c

l2tp: fix a race in l2tp_ip_sendmsg()

2012-06-08 14:30:51 -07:00

l2tp_netlink.c

l2tp: session is an array not a pointer

2012-10-26 03:46:41 -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