Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Wed, 23 Jul 2008 00:54:47 +0000 (17:54 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 23 Jul 2008 00:54:47 +0000 (17:54 -0700)

Trivial merge