| commit | 0ff5ce7f30b45cc2014cec465c0e96c16877116e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 29 20:37:59 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 29 20:37:59 2008 -0700 |
| tree | 63e3ed2af568aba47162171ad91ccfc440407d05 | |
| parent | c4755d16fce9a4cdbb316c17657444856821bd4b [diff] | |
| parent | ba7cc365f50cee0758e89217875e56ca3d972ed3 [diff] |
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