Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Thu, 7 Aug 2008 09:10:27 +0000 (02:10 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 7 Aug 2008 09:10:27 +0000 (02:10 -0700)

Trivial merge