Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 21 May 2012 01:53:04 +0000 (21:53 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 21 May 2012 01:53:04 +0000 (21:53 -0400)

Trivial merge