Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 30 Jul 2005 17:15:57 +0000 (10:15 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 30 Jul 2005 17:15:57 +0000 (10:15 -0700)

Trivial merge