Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 21 Dec 2005 19:05:15 +0000 (11:05 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 21 Dec 2005 19:05:15 +0000 (11:05 -0800)

Trivial merge