Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 25 Jan 2012 03:57:24 +0000 (22:57 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 25 Jan 2012 03:57:24 +0000 (22:57 -0500)

Trivial merge