Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 24 Oct 2011 22:18:09 +0000 (18:18 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Oct 2011 22:18:09 +0000 (18:18 -0400)

Trivial merge