Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 00:29:55 +0000 (16:29 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 00:29:55 +0000 (16:29 -0800)

Trivial merge