Merge branch 'to_linus' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 22 Dec 2005 17:33:04 +0000 (09:33 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 22 Dec 2005 17:33:04 +0000 (09:33 -0800)

Trivial merge