Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus
Linus Torvalds [Tue, 16 Aug 2005 16:43:13 +0000 (09:43 -0700)]

Trivial merge