Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Wed, 3 Sep 2008 21:43:30 +0000 (14:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 3 Sep 2008 21:43:30 +0000 (14:43 -0700)

Trivial merge