Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 6 Jun 2012 22:06:41 +0000 (15:06 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Jun 2012 22:06:41 +0000 (15:06 -0700)

Trivial merge