tree 8b049ef383307f5dae91b5c9cf78dbfb9b74a4d1
parent 11a164a04382d735230b01f4cc46ad78a7c4abf6
parent 4d3797d7e1861ac1af150a6189315786c5e1c820
author David S. Miller <davem@davemloft.net> 1370473003 -0700
committer David S. Miller <davem@davemloft.net> 1370475450 -0700

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

Merge 'net' bug fixes into 'net-next' as we have patches
that will build on top of them.

This merge commit includes a change from Emil Goode
(emilgoode@gmail.com) that fixes a warning that would
have been introduced by this merge.  Specifically it
fixes the pingv6_ops method ipv6_chk_addr() to add a
"const" to the "struct net_device *dev" argument and
likewise update the dummy_ipv6_chk_addr() declaration.

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