Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
David S. Miller [Wed, 30 Jul 2008 22:44:30 +0000 (15:44 -0700)]

Trivial merge