Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 12 Apr 2012 23:41:23 +0000 (19:41 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 12 Apr 2012 23:41:23 +0000 (19:41 -0400)

Trivial merge