Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 8 Aug 2006 21:19:23 +0000 (14:19 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 8 Aug 2006 21:19:23 +0000 (14:19 -0700)

Trivial merge