Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 10 Jul 2009 03:18:24 +0000 (20:18 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 10 Jul 2009 03:18:24 +0000 (20:18 -0700)

Trivial merge