Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 2 Dec 2011 18:49:21 +0000 (13:49 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 2 Dec 2011 18:49:21 +0000 (13:49 -0500)

Trivial merge