Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 3 Aug 2005 23:50:19 +0000 (16:50 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 3 Aug 2005 23:50:19 +0000 (16:50 -0700)

Trivial merge