Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 17 May 2012 02:17:37 +0000 (22:17 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 17 May 2012 02:17:37 +0000 (22:17 -0400)

Trivial merge