Merge branch 'to_linus' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Linus Torvalds [Tue, 20 Dec 2005 02:34:37 +0000 (18:34 -0800)]

Trivial merge