Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 13 Oct 2009 19:55:20 +0000 (12:55 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Oct 2009 19:55:20 +0000 (12:55 -0700)

Trivial merge