Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 7 Dec 2011 02:10:05 +0000 (21:10 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 7 Dec 2011 02:10:05 +0000 (21:10 -0500)

Trivial merge