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 (Collapse)	Author	Files	Lines
2013-06-03	zsh: update zsh autocompletion functions to implementation	Hideo Hattori	1	-2/+6
	Update those functions to implementation status. Signed-off-by: Hideo Hattori <hhatto.jp@gmail.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-05-13	zsh: add netsniff-ng zsh auto completion support	Daniel Borkmann	1	-0/+21
	Hideo Hattori wrote a set of auto completion scripts for zsh that support netsniff-ng tools. Big thanks for that! Follow-up commits still need to address updated command-line options. Signed-off-by: Hideo Hattori <hhatto.jp@gmail.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>