You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 1eb6337835 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media ... * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (348 commits) [media] pctv452e: Remove bogus code [media] adv7175: Make use of media bus pixel codes [media] media: vb2: fix incorrect return value [media] em28xx: implement VIDIOC_ENUM_FRAMESIZES [media] cx23885: Stop the risc video fifo before reconfiguring it [media] cx23885: Avoid incorrect error handling and reporting [media] cx23885: Avoid stopping the risc engine during buffer timeout [media] cx23885: Removed a spurious function cx23885_set_scale() [media] cx23885: v4l2 api compliance, set the audioset field correctly [media] cx23885: hook the audio selection functions into the main driver [media] cx23885: add generic functions for dealing with audio input selection [media] cx23885: fixes related to maximum number of inputs and range checking [media] cx23885: Initial support for the MPX-885 mini-card [media] cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband use [media] cx23885: Enable audio line in support from the back panel [media] cx23885: Allow the audio mux config to be specified on a per input basis [media] cx25840: Enable support for non-tuner LR1/LR2 audio inputs [media] cx23885: Name an internal i2c part and declare a bitfield by name [media] cx23885: Ensure VBI buffers timeout quickly - bugfix for vbi hangs during streaming [media] cx23885: remove channel dump diagnostics when a vbi buffer times out ... Fix up trivial conflicts in drivers/misc/altera-stapl/altera.c (header file rename vs add)		13 years ago
..
media	[media] media: DocBook: Fix trivial typo in Sub-device Interface	14 years ago
.gitignore	[media] DocBook: Add a chapter to describe media errors	14 years ago
80211.tmpl	mac80211: document client powersave	14 years ago
Makefile	[media] DocBook: Use base64 for gif/png files	14 years ago
alsa-driver-api.tmpl	…
debugobjects.tmpl	…
device-drivers.tmpl	driver core: Add the device driver-model structures to kerneldoc	14 years ago
deviceiobook.tmpl	…
drm.tmpl	…
filesystems.tmpl	…
gadget.tmpl	…
genericirq.tmpl	genirq: Update DocBook comments	14 years ago
kernel-api.tmpl	…
kernel-hacking.tmpl	sched: Generalize sleep inside spinlock detection	14 years ago
kernel-locking.tmpl	Fix common misspellings	14 years ago
kgdb.tmpl	…
libata.tmpl	Fix common misspellings	14 years ago
librs.tmpl	…
lsm.tmpl	…
mcabook.tmpl	…
media_api.tmpl	[media] DVB: Point to the generic error chapter	14 years ago
mtdnand.tmpl	mtd: kill CONFIG_MTD_PARTITIONS	14 years ago
networking.tmpl	…
rapidio.tmpl	docbook: fix rapidio warning	14 years ago
regulator.tmpl	Fix common misspellings	14 years ago
s390-drivers.tmpl	…
scsi.tmpl	…
sh.tmpl	…
stylesheet.xsl	…
tracepoint.tmpl	…
uio-howto.tmpl	uio: Support physical addresses >32 bits on 32-bit systems	14 years ago
usb.tmpl	Fix common misspellings	14 years ago
writing-an-alsa-driver.tmpl	ALSA: mpu401: clean up interrupt specification	14 years ago
writing_usb_driver.tmpl	…
z8530book.tmpl	…