Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Fri, 25 Apr 2008 07:31:07 +0000 (00:31 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 25 Apr 2008 07:31:07 +0000 (00:31 -0700)

Trivial merge