Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
Linus Torvalds [Wed, 9 Nov 2005 21:47:34 +0000 (13:47 -0800)]

Trivial merge