Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 1 Dec 2005 23:52:12 +0000 (15:52 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 1 Dec 2005 23:52:12 +0000 (15:52 -0800)

Trivial merge