David S. Miller 188d1f76d0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/e1000e/ethtool.c drivers/net/vmxnet3/vmxnet3_drv.c drivers/net/wireless/iwlwifi/dvm/tx.c net/ipv6/route.c The ipv6 route.c conflict is simple, just ignore the 'net' side change as we fixed the same problem in 'net-next' by eliminating cached neighbours from ipv6 routes. The e1000e conflict is an addition of a new statistic in the ethtool code, trivial. The vmxnet3 conflict is about one change in 'net' removing a guarding conditional, whilst in 'net-next' we had a netdev_info() conversion. The iwlwifi conflict is dealing with a WARN_ON() conversion in 'net-next' vs. a revert happening in 'net'. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-02-05 14:12:20 -05:00
..
datagram.c	net: skb_free_datagram_locked() doesnt drop all packets	2012-06-27 15:40:57 -07:00
dev.c	net: disallow drivers with buggy VLAN accel to register_netdevice()	2013-01-29 22:58:40 -05:00
dev_addr_lists.c	net: correct check in dev_addr_del()	2012-11-15 17:57:53 -05:00
drop_monitor.c	drop_monitor: dont sleep in atomic context	2012-06-04 11:42:01 -04:00
dst.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-10-02 13:38:27 -07:00
ethtool.c	ethtool: consolidate work with ethtool_ops	2013-01-07 19:54:19 -08:00
fib_rules.c	net: Enable a userns root rtnl calls that are safe for unprivilged users	2012-11-18 20:33:36 -05:00
filter.c	sk-filter: Add ability to lock a socket filter program	2013-01-17 03:21:25 -05:00
flow.c	net: Use IS_ERR_OR_NULL().	2013-01-22 14:28:28 -05:00
flow_dissector.c	net: move rx and tx hash functions to net/core/flow_dissector.c	2013-01-21 14:26:17 -05:00
gen_estimator.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
gen_stats.c	gen_stats: Stop using NLA_PUT*().	2012-04-02 04:33:44 -04:00
iovec.c	net: get rid of some pointless casts to sockaddr	2012-03-11 19:11:22 -07:00
link_watch.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-10-02 13:38:27 -07:00
Makefile	sock_diag: Move the sock_ code to net/core/	2011-12-06 13:58:02 -05:00
neighbour.c	net neigh: Optimize neighbor entry size calculation.	2013-01-28 23:17:51 -05:00
net-sysfs.c	net: Add support for XPS without sysfs being defined	2013-01-10 22:47:04 -08:00
net-sysfs.h	xps: Add CONFIG_XPS	2010-11-28 18:24:14 -08:00
net-traces.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
net_namespace.c	userns: Require CAP_SYS_ADMIN for most uses of setns.	2012-12-14 16:12:03 -08:00
netevent.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
netpoll.c	netpoll: use the net namespace of current process instead of init_net	2013-01-28 18:32:55 -05:00
netprio_cgroup.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-12-12 18:07:07 -08:00
pktgen.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-02-05 14:12:20 -05:00
request_sock.c	tcp: fix a panic on UP machines in reqsk_fastopen_remove	2013-01-14 18:10:05 -05:00
rtnetlink.c	netns: fdb: allow unprivileged users to add/del fdb entries	2013-02-04 13:12:16 -05:00
scm.c	net: net_cls: fd passed in SCM_RIGHTS datagram not set correctly	2013-01-22 14:17:38 -05:00
secure_seq.c	netfilter: ipv6: add IPv6 NAT support	2012-08-30 03:00:17 +02:00
skbuff.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-02-05 14:12:20 -05:00
sock.c	net: remove redundant check for timer pending state before del_timer	2013-02-04 13:26:49 -05:00
sock_diag.c	netlink: hide struct module parameter in netlink_kernel_create	2012-09-08 18:46:30 -04:00
stream.c
sysctl_net_core.c	net: avoid to hang up on sending due to sysctl configuration overflow.	2013-01-28 23:15:27 -05:00
timestamping.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
user_dma.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
utils.c	net: add doc for in4_pton()	2012-10-12 13:56:52 -04:00