From: David S. Miller <davem@davemloft.net>
Date: Wed, 5 Jun 2013 22:56:43 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.11-rc1~16^2~173
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bc19fb82d4c05a9eee19d6d2aab2ce26e499ec2;p=pandora-kernel.git

Merge git://git./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>
---

6bc19fb82d4c05a9eee19d6d2aab2ce26e499ec2
Reading git-diff-tree failed