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

Conflicts:
	drivers/net/ethernet/intel/e1000e/netdev.c

Minor conflict in e1000e, a line that got fixed in 'net'
has been removed in 'net-next'.

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

2013-03-12 05:52:22 -04:00

..

datagram.c

net: fix infinite loop in __skb_recv_datagram()

2013-02-12 16:07:19 -05:00

dev_addr_lists.c

net: move procfs code to net/core/net-procfs.c

2013-02-19 00:51:10 -05:00

dev_ioctl.c

net: move ioctl functions into a separated file

2013-02-18 12:27:32 -05:00

dev.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-03-12 05:52:22 -04:00

drop_monitor.c

drop_monitor: dont sleep in atomic context

2012-06-04 11:42:01 -04:00

dst.c

ipv6: fix race condition regarding dst->expires and dst->from.

2013-02-20 15:11:45 -05:00

ethtool.c

tunneling: Add generic Tunnel segmentation.

2013-03-09 16:09:17 -05: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_dissector.c

flow_dissector: support L2 GRE

2013-03-12 05:14:06 -04:00

flow.c

hlist: drop the node parameter from iterators

2013-02-27 19:10:24 -08: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

net: move procfs code to net/core/net-procfs.c

2013-02-19 00:51:10 -05:00

neighbour.c

net neigh: Optimize neighbor entry size calculation.

2013-01-28 23:17:51 -05:00

net_namespace.c

new helper: file_inode(file)

2013-02-22 23:31:31 -05:00

net-procfs.c

hlist: drop the node parameter from iterators

2013-02-27 19:10:24 -08:00

net-sysfs.c

net/core: apply pm_runtime_set_memalloc_noio on network devices

2013-02-23 17:50:16 -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

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 smatch warnings in netpoll core code

2013-02-13 11:56:46 -05:00

netprio_cgroup.c

net: core: Remove unnecessary alloc/OOM messages

2013-02-06 14:58:52 -05:00

pktgen.c

net: proc: change proc_net_remove to remove_proc_entry

2013-02-18 14:53:08 -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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-03-12 05:52:22 -04: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

tunneling: Capture inner mac header during encapsulation.

2013-03-09 16:08:57 -05:00

sock_diag.c

sock_diag: Simplify sock_diag_handlers[] handling in __sock_diag_rcv_msg

2013-02-23 13:51:54 -05:00

sock.c

sock: only define socket limit if mem cgroup configured

2013-02-22 15:10:19 -05:00

stream.c

net: Fix the condition passed to sk_wait_event()

2010-10-03 20:41:32 -07:00

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