Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Tue, 28 Oct 2008 18:01:07 +0000 (11:01 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 28 Oct 2008 18:01:07 +0000 (11:01 -0700)

Trivial merge