Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Fri, 31 Oct 2008 06:50:18 +0000 (23:50 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 31 Oct 2008 06:50:18 +0000 (23:50 -0700)

Trivial merge