From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 30 Apr 2008 03:37:59 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
X-Git-Tag: v2.6.26-rc1~344
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ff5ce7f30b45cc2014cec465c0e96c16877116e;p=linux-2.6

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (7798): tuners/Kconfig: Change config name and help to reflect dynamic load for tuners
  V4L/DVB (7794): cx88: Fix a warning
  V4L/DVB (7792): ivtv: correct misspelled "HIMEM4G" to "HIGHMEM4G" in error message
  V4L/DVB (7791): ivtv: POLLHUP must be returned on eof
  V4L/DVB (7789b): Fix merge conflicts
---

0ff5ce7f30b45cc2014cec465c0e96c16877116e