Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Linus Torvalds [Tue, 6 Sep 2005 07:32:12 +0000 (00:32 -0700)]

Trivial merge