Linus Torvalds 4a7c1ff236 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: (57 commits) [media] as3645a: Fix compilation by including slab.h [media] s5p-fimc: Remove linux/version.h include from fimc-mdevice.c [media] s5p-mfc: Remove linux/version.h include from s5p_mfc.c [media] ds3000: using logical && instead of bitwise & [media] v4l2-ctrls: make control names consistent [media] DVB: dib0700, add support for Nova-TD LEDs [media] DVB: dib0700, add corrected Nova-TD frontend_attach [media] DVB: dib0700, separate stk7070pd initialization [media] DVB: dib0700, move Nova-TD Stick to a separate set [media] : add MODULE_FIRMWARE to dib0700 [media] DVB-CORE: remove superfluous DTV_CMDs [media] s5p-jpeg: adapt to recent videobuf2 changes [media] s5p-g2d: fixed a bug in controls setting function [media] s5p-mfc: Fix volatile controls setup [media] drivers/media/video/s5p-mfc/s5p_mfc.c: adjust double test [media] drivers/media/video/s5p-fimc/fimc-capture.c: adjust double test [media] s5p-fimc: Fix incorrect control ID assignment [media] dvb_frontend: Don't call get_frontend() if idle [media] DocBook/dvbproperty.xml: Remove DTV_MODULATION from ISDB-T [media] DocBook/dvbproperty.xml: Fix ISDB-T delivery system parameters ...		2012-01-18 12:53:54 -08:00
..
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-01-18 12:53:54 -08:00
.gitignore	[media] DocBook: Add a chapter to describe media errors	2011-07-27 17:53:35 -03:00
80211.tmpl	mac80211: document client powersave	2011-09-30 15:57:24 -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	driver core: Add the device driver-model structures to kerneldoc	2011-05-06 18:01:05 -07:00
deviceiobook.tmpl
drm.tmpl	DocBook/drm: Clean up a todo-note	2011-08-29 20:00:37 +00:00
filesystems.tmpl
gadget.tmpl
genericirq.tmpl	genirq: Update DocBook comments	2011-04-23 15:56:23 +02:00
kernel-api.tmpl
kernel-hacking.tmpl	sched: Generalize sleep inside spinlock detection	2011-06-23 00:44:38 +02:00
kernel-locking.tmpl	Fix common misspellings	2011-03-31 11:26:23 -03:00
kgdb.tmpl
libata.tmpl	Fix common misspellings	2011-03-31 11:26:23 -03:00
librs.tmpl
lsm.tmpl
Makefile	[media] DocBook: Use base64 for gif/png files	2011-07-27 17:52:59 -03:00
mcabook.tmpl
media_api.tmpl	[media] DVB: Point to the generic error chapter	2011-07-27 17:53:37 -03:00
mtdnand.tmpl	mtd: doc: remove mention of MEMSETOOBSEL	2011-09-11 15:02:18 +03: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
sh.tmpl
stylesheet.xsl
tracepoint.tmpl
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
writing-an-alsa-driver.tmpl	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
z8530book.tmpl