From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 13 Nov 2006 16:27:17 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
X-Git-Tag: v2.6.19-rc6~28
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=bf2b3de2a8e66e5f554c2113fac688bcaaca77fb;p=powerpc.git

Merge branch 'master' of /linux/kernel/git/mchehab/v4l-dvb

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (4818): Flexcop-usb: fix debug printk
  V4L/DVB (4817): Fix uses of "&&" where "&" was intended
  V4L/DVB (4816): Change tuner type for Avermedia A16AR
  V4L/DVB (4815): Remote support for Avermedia A16AR
  V4L/DVB (4814): Remote support for Avermedia 777
  V4L/DVB (4804): Fix missing i2c dependency for saa7110
  V4L/DVB (4802): Cx88: fix remote control on WinFast 2000XP Expert
  V4L/DVB (4795): Tda826x: use correct max frequency
---

bf2b3de2a8e66e5f554c2113fac688bcaaca77fb