Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Linus Torvalds [Mon, 9 Jan 2006 21:03:58 +0000 (13:03 -0800)]

Trivial merge