Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 1 Aug 2011 07:09:40 +0000 (00:09 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 1 Aug 2011 07:09:40 +0000 (00:09 -0700)

Trivial merge