Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Sun, 22 Aug 2010 06:32:24 +0000 (23:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 22 Aug 2010 06:32:24 +0000 (23:32 -0700)

Trivial merge