David S. Miller 5f013c9bc7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/altera/altera_sgdma.c net/netlink/af_netlink.c net/sched/cls_api.c net/sched/sch_api.c The netlink conflict dealt with moving to netlink_capable() and netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations in non-init namespaces. These were simple transformations from netlink_capable to netlink_ns_capable. The Altera driver conflict was simply code removal overlapping some void pointer cast cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-12 13:19:14 -04:00
..
datagram.c
dev.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-12 13:19:14 -04:00
dev_addr_lists.c
dev_ioctl.c
drop_monitor.c
dst.c	ipv4: add a sock pointer to dst->output() path.	2014-04-15 13:47:15 -04:00
ethtool.c	ethtool: exit the loop when invalid index occurs	2014-04-28 13:28:43 -04:00
fib_rules.c
filter.c	net: filter: make BPF conversion more readable	2014-05-12 00:23:55 -04:00
flow.c
flow_dissector.c
gen_estimator.c
gen_stats.c
iovec.c
link_watch.c
Makefile
neighbour.c
net-procfs.c
net-sysfs.c
net-sysfs.h
net-traces.c
net_namespace.c	net_namespace: trivial cleanup	2014-04-26 12:50:23 -04:00
netclassid_cgroup.c
netevent.c
netpoll.c
netprio_cgroup.c
pktgen.c	pktgen: be friendly to LLTX devices	2014-04-12 01:59:38 -04:00
ptp_classifier.c
request_sock.c
rtnetlink.c	rtnetlink: Only supply IFLA_VF_PORTS information when RTEXT_FILTER_VF is set	2014-04-24 13:52:54 -04:00
scm.c
secure_seq.c
skbuff.c	net: Fix use after free by removing length arg from sk_data_ready callbacks.	2014-04-11 16:15:36 -04:00
sock.c	net: Add variants of capable for use on on sockets	2014-04-24 13:44:53 -04:00
sock_diag.c	net: Move the permission check in sock_diag_put_filterinfo to packet_diag_dump	2014-04-24 13:44:53 -04:00
stream.c
sysctl_net_core.c
timestamping.c
user_dma.c
utils.c