Merge branch 'sx8' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 16:16:58 +0000 (09:16 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 16:16:58 +0000 (09:16 -0700)

Trivial merge