[GIT PATCHES] V4L/DVB fixes for 2.6.26

[Mauro Carvalho Chehab]

Linus,

Please pull from:
        ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git master

For the following trivial fixes:

   - Fix merge conflicts on Kconfig items;
   - two small fixes on ivtv;
   - a warning fix at cx88;
   - tuners/Kconfig: Change config name and help to reflect dynamic load for 
     tuners.

Cheers,
Mauro.

---

 drivers/media/common/tuners/Kconfig     |    9 +++++++--
 drivers/media/video/cx18/Kconfig        |    2 +-
 drivers/media/video/cx18/cx18-driver.c  |    2 +-
 drivers/media/video/cx88/cx88-i2c.c     |    1 -
 drivers/media/video/ivtv/ivtv-driver.c  |    6 +++---
 drivers/media/video/ivtv/ivtv-fileops.c |    4 +++-
 drivers/media/video/tuner-core.c        |    2 +-
 7 files changed, 16 insertions(+), 10 deletions(-)

Hans Verkuil (1):
      V4L/DVB (7791): ivtv: POLLHUP must be returned on eof

Mauro Carvalho Chehab (3):
      V4L/DVB (7789b): Fix merge conflicts
      V4L/DVB (7794): cx88: Fix a warning
      V4L/DVB (7798): tuners/Kconfig: Change config name and help to reflect dynamic load for tuners

Robert P. J. Day (1):
      V4L/DVB (7792): ivtv: correct misspelled "HIMEM4G" to "HIGHMEM4G" in error message

---------------------------------------------------
V4L/DVB development is hosted at http://linuxtv.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/