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

All merge conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
Age	Commit message (Expand)	Author	Files	Lines
2013-06-04	xutils: eliminate xutils, move rest to epoll2	Daniel Borkmann	1	-1/+0
2013-06-04	xio: rename xio to ioops and reduce its includes	Daniel Borkmann	1	-1/+1
2013-06-03	iosched: break out io scheduling functions from xutils	Daniel Borkmann	1	-0/+1
2013-04-09	pcap_io: introduce init_once helper that is called with priviledges	Daniel Borkmann	1	-2/+6
2013-03-15	all: import netsniff-ng 0.5.8-rc0 source	Daniel Borkmann	1	-0/+193