]> err.no Git - linux-2.6/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Apr 2008 03:37:59 +0000 (20:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Apr 2008 03:37:59 +0000 (20:37 -0700)
commit0ff5ce7f30b45cc2014cec465c0e96c16877116e
tree63e3ed2af568aba47162171ad91ccfc440407d05
parentc4755d16fce9a4cdbb316c17657444856821bd4b
parentba7cc365f50cee0758e89217875e56ca3d972ed3
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