Merge 'misc-fixes' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 23 Jun 2005 16:25:04 +0000 (09:25 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 23 Jun 2005 16:25:04 +0000 (09:25 -0700)

Trivial merge