Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 01:06:53 +0000 (17:06 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 01:06:53 +0000 (17:06 -0800)

Trivial merge