Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Wed, 27 Aug 2008 10:54:45 +0000 (03:54 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 27 Aug 2008 10:54:45 +0000 (03:54 -0700)

Trivial merge