Merge branch 'for-linus' from master.kernel.org:/pub/scm/linux/kernel/git/roland...
Linus Torvalds [Wed, 28 Sep 2005 14:47:55 +0000 (07:47 -0700)]

Trivial merge