Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 9 Nov 2005 21:47:34 +0000 (13:47 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 9 Nov 2005 21:47:34 +0000 (13:47 -0800)

Trivial merge