Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 17 Jan 2006 07:20:01 +0000 (23:20 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 17 Jan 2006 07:20:01 +0000 (23:20 -0800)

Trivial merge