Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 18 Nov 2005 21:49:44 +0000 (13:49 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 18 Nov 2005 21:49:44 +0000 (13:49 -0800)

Trivial merge