Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 10 Apr 2012 18:30:45 +0000 (14:30 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 Apr 2012 18:30:45 +0000 (14:30 -0400)

Trivial merge