David S. Miller 85dcce7a73 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/r8152.c drivers/net/xen-netback/netback.c Both the r8152 and netback conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-14 22:31:55 -04:00
..
datagram.c	net, datagram: fix the incorrect comment in zerocopy_sg_from_iovec()	2013-10-29 00:19:04 -04:00
dev_addr_lists.c	net: Correctly sync addresses from multiple sources to single device	2014-01-23 13:06:34 -08:00
dev_ioctl.c	net_tstamp: Add SIOCGHWTSTAMP ioctl to match SIOCSHWTSTAMP	2013-11-19 19:07:21 +00:00
dev.c	net: Convert uses of __constant_<foo> to <foo>	2014-03-12 15:28:06 -04:00
drop_monitor.c	net: drop_monitor: fix the value of maxattr	2013-12-09 21:10:38 -05:00
dst.c	net: pass info struct via netdevice notifier	2013-05-28 13:11:01 -07:00
ethtool.c	net: Add layer 2 hardware acceleration operations for macvlan devices	2013-11-07 19:11:41 -05:00
fib_rules.c	net: fix 'ip rule' iif/oif device rename	2014-02-09 19:02:52 -08:00
filter.c	bpf: do not use reciprocal divide	2014-01-15 17:02:08 -08:00
flow_dissector.c	net: Convert uses of __constant_<foo> to <foo>	2014-03-12 15:28:06 -04:00
flow.c	flowcache: Fix resource leaks on namespace exit.	2014-03-12 15:31:18 -04:00
gen_estimator.c	net_sched: add 64bit rate estimators	2013-06-11 02:51:03 -07:00
gen_stats.c	net_sched: add 64bit rate estimators	2013-06-11 02:51:03 -07:00
iovec.c	net: rework recvmsg handler msg_name and msg_namelen logic	2013-11-20 21:52:30 -05:00
link_watch.c	net: make all team port device link events urgent	2013-06-13 02:31:41 -07:00
Makefile	net: netprio: rename config to be more consistent with cgroup configs	2014-01-03 23:41:42 +01:00
neighbour.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
net_namespace.c	userns: Kill nsown_capable it makes the wrong thing easy	2013-08-30 23:44:11 -07:00
net-procfs.c	rps: selective flow shedding during softnet overflow	2013-05-20 13:48:04 -07:00
net-sysfs.c	net: Add sysfs file for port number	2014-02-26 15:38:06 -05:00
net-sysfs.h	net: netdev_kobject_init: annotate with __init	2014-01-05 20:27:54 -05:00
net-traces.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
netclassid_cgroup.c	net: net_cls: move cgroupfs classid handling into core	2014-01-03 23:41:41 +01: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: fix netconsole IPv6 setup	2014-02-06 21:28:06 -08:00
netprio_cgroup.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-01-25 11:17:34 -08:00
pktgen.c	pktgen: document all supported flags	2014-02-24 18:54:26 -05:00
request_sock.c	net: remove unnecessary return's	2014-02-13 18:33:38 -05:00
rtnetlink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-02-19 01:24:22 -05:00
scm.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2013-09-07 14:35:32 -07:00
secure_seq.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-23 16:49:34 -04:00
skbuff.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
sock_diag.c	sock_diag: fix filter code sent to userspace	2013-06-10 22:23:32 -07:00
sock.c	tcp: tcp_release_cb() should release socket ownership	2014-03-11 16:45:59 -04:00
stream.c	net: replace macros net_random and net_srandom with direct calls to prandom	2014-01-14 15:15:25 -08:00
sysctl_net_core.c	rps: NUMA flow limit allocations	2013-12-19 19:00:07 -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: make net_get_random_once irq safe	2013-10-25 19:03:39 -04:00