Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 17 Aug 2010 03:44:14 +0000 (20:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 Aug 2010 03:44:14 +0000 (20:44 -0700)

Trivial merge