Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 29 Nov 2012 17:51:17 +0000 (12:51 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 29 Nov 2012 17:51:17 +0000 (12:51 -0500)
Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge