Linus Torvalds 8762541f06 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media ... Pull second set of media updates from Mauro Carvalho Chehab: - radio API: add support to work with radio frequency bands - new AM/FM radio drivers: radio-shark, radio-shark2 - new Remote Controller USB driver: iguanair - conversion of several drivers to the v4l2 core control framework - new board additions at existing drivers - the remaining (and vast majority of the patches) are due to drivers/DocBook fixes/cleanups. * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (154 commits) [media] radio-tea5777: use library for 64bits div [media] tlg2300: Declare MODULE_FIRMWARE usage [media] lgs8gxx: Declare MODULE_FIRMWARE usage [media] xc5000: Add MODULE_FIRMWARE statements [media] s2255drv: Add MODULE_FIRMWARE statement [media] dib8000: move dereference after check for NULL [media] Documentation: Update cardlists [media] bttv: add support for Aposonic W-DVR [media] cx25821: Remove bad strcpy to read-only char* [media] pms.c: remove duplicated include [media] smiapp-core.c: remove duplicated include [media] via-camera: pass correct format settings to sensor [media] rtl2832.c: minor cleanup [media] Add support for the IguanaWorks USB IR Transceiver [media] Minor cleanups for MCE USB [media] drivers/media/dvb/siano/smscoreapi.c: use list_for_each_entry [media] Use a named union in struct v4l2_ioctl_info [media] mceusb: Add Twisted Melon USB IDs [media] staging/media/solo6x10: use module_pci_driver macro [media] staging/media/dt3155v4l: use module_pci_driver macro ... Conflicts: Documentation/feature-removal-schedule.txt		2012-07-31 18:47:44 -07:00
..
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-07-31 18:47:44 -07:00
.gitignore	[media] DocBook: Add a chapter to describe media errors	2011-07-27 17:53:35 -03:00
80211.tmpl	mac80211: remove ieee80211_key_removed	2012-07-09 14:49:15 +02: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
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