Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 7 Jul 2010 22:59:38 +0000 (15:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 7 Jul 2010 22:59:38 +0000 (15:59 -0700)

Trivial merge