Merge branch 'for-linus' from master.kernel.org:/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 28 Sep 2005 14:47:55 +0000 (07:47 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 28 Sep 2005 14:47:55 +0000 (07:47 -0700)

Trivial merge