David S. Miller 0d6c4a2e46 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/e1000e/param.c drivers/net/wireless/iwlwifi/iwl-agn-rx.c drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c drivers/net/wireless/iwlwifi/iwl-trans.h Resolved the iwlwifi conflict with mainline using 3-way diff posted by John Linville and Stephen Rothwell. In 'net' we added a bug fix to make iwlwifi report a more accurate skb->truesize but this conflicted with RX path changes that happened meanwhile in net-next. In e1000e a conflict arose in the validation code for settings of adapter->itr. 'net-next' had more sophisticated logic so that logic was used. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-05-07 23:35:40 -04:00
..
Kconfig
l2tp_core.c	l2tp: let iproute2 create L2TPv3 IP tunnels using IPv6	2012-05-01 09:30:55 -04:00
l2tp_core.h	l2tp: netlink api for l2tpv3 ipv6 unmanaged tunnels	2012-05-01 09:30:55 -04:00
l2tp_debugfs.c	l2tp: show IPv6 addresses in l2tp debugfs file	2012-05-01 09:30:55 -04:00
l2tp_eth.c
l2tp_ip.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
l2tp_ip6.c	l2tp: introduce L2TPv3 IP encapsulation support for IPv6	2012-05-01 09:30:55 -04:00
l2tp_netlink.c	l2tp: netlink api for l2tpv3 ipv6 unmanaged tunnels	2012-05-01 09:30:55 -04:00
l2tp_ppp.c	l2tp: pppol2tp_connect() handles ipv6 sockaddr variants	2012-05-01 09:30:55 -04:00
Makefile	l2tp: introduce L2TPv3 IP encapsulation support for IPv6	2012-05-01 09:30:55 -04:00