Linus Torvalds aace99e57c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media ... Pull media fixes from Mauro Carvalho Chehab. Trivial conflict due to new USB HID ID's being added next to each other (Baanto vs Axentia). * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (44 commits) [media] smia: Fix compile failures [media] Fix VIDIOC_DQEVENT docbook entry [media] s5p-fimc: Fix control creation function [media] s5p-mfc: Fix checkpatch error in s5p_mfc_shm.h file [media] s5p-mfc: Fix setting controls [media] v4l/s5p-mfc: added image size align in VIDIOC_TRY_FMT [media] v4l/s5p-mfc: corrected encoder v4l control definitions [media] v4l: mem2mem_testdev: Fix race conditions in driver [media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism [media] cxd2820r: Fix an incorrect modulation type bitmask [media] em28xx: Show a warning if the board does not support remote controls [media] em28xx: Add remote control support for Terratec's Cinergy HTC Stick HD [media] USB: Staging: media: lirc: initialize spinlocks before usage [media] Revert "[media] media: mx2_camera: Fix mbus format handling" [media] bw-qcam: driver and pixfmt documentation fixes [media] cx88: fix firmware load on big-endian systems [media] cx18: support big-endian systems [media] ivtv: fix support for big-endian systems [media] tuner-core: return the frequency range of the correct tuner [media] v4l2-dev.c: fix g_parm regression in determine_valid_ioctls() ...		2012-06-25 14:53:09 -07:00
..
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-06-25 14:53:09 -07:00
.gitignore	[media] DocBook: Add a chapter to describe media errors	2011-07-27 17:53:35 -03:00
80211.tmpl	mac80211: notify driver of rate control updates	2012-04-10 14:54:08 -04:00
alsa-driver-api.tmpl
debugobjects.tmpl	debugobjects: Extend to assert that an object is initialized	2011-11-23 18:49:22 +01:00
device-drivers.tmpl	Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi	2012-04-02 09:50:40 -07:00
deviceiobook.tmpl	docbook: change iomap source filename in deviceiobook	2012-01-23 08:44:54 -08:00
drm.tmpl	DocBook/drm: Clean up a todo-note	2011-08-29 20:00:37 +00:00
filesystems.tmpl	Documentation: broken URL in filesystems.tmpl	2012-02-28 15:56:09 +01:00
gadget.tmpl
genericirq.tmpl	genirq: Update DocBook comments	2011-04-23 15:56:23 +02:00
kernel-api.tmpl	MCA: delete all remaining traces of microchannel bus support.	2012-05-17 19:06:13 -04:00
kernel-hacking.tmpl	Documentation: Fix typo in multiple files in Documentation	2012-04-16 14:37:13 +02:00
kernel-locking.tmpl	Fix common misspellings	2011-03-31 11:26:23 -03:00
kgdb.tmpl	kgdb,debug_core: add the ability to control the reboot notifier	2012-03-22 15:07:16 -05:00
libata.tmpl	Documentation: Fix typo in multiple files in Documentation	2012-04-16 14:37:13 +02:00
librs.tmpl
lsm.tmpl
Makefile	MCA: delete all remaining traces of microchannel bus support.	2012-05-17 19:06:13 -04:00
media_api.tmpl	[media] DVB: Point to the generic error chapter	2011-07-27 17:53:37 -03:00
mtdnand.tmpl	mtd: nand: kill NAND_NO_AUTOINCR option	2012-05-13 23:15:38 -05:00
networking.tmpl
rapidio.tmpl	docbook: fix rapidio warning	2011-03-27 19:30:19 -07:00
regulator.tmpl	Fix common misspellings	2011-03-31 11:26:23 -03:00
s390-drivers.tmpl
scsi.tmpl	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
sh.tmpl	sh: clkfwk: Kill off unused clk_set_rate_ex().	2010-11-15 18:25:12 +09:00
stylesheet.xsl	docbook: use IDs as filenames to support multiple books	2010-08-05 13:21:24 -07:00
tracepoint.tmpl	workqueue: Add a workqueue chapter to the tracepoint docbook	2010-08-27 12:27:36 +02:00
uio-howto.tmpl	uio: documentation fixups	2011-11-15 11:14:01 -08:00
usb.tmpl	Fix common misspellings	2011-03-31 11:26:23 -03:00
writing_usb_driver.tmpl	USB: rename usb_buffer_alloc() and usb_buffer_free() users	2010-05-20 13:21:38 -07:00
writing-an-alsa-driver.tmpl	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
z8530book.tmpl