Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 4 Aug 2005 17:36:25 +0000 (10:36 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 4 Aug 2005 17:36:25 +0000 (10:36 -0700)

Trivial merge