Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 2 Jan 2012 23:56:49 +0000 (18:56 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 2 Jan 2012 23:56:49 +0000 (18:56 -0500)

Trivial merge