Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Wed, 18 Jun 2008 04:32:08 +0000 (21:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Jun 2008 04:32:08 +0000 (21:32 -0700)

Trivial merge