Linus Torvalds 9179746652 Merge branch 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 ... * 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: [media] mantis_pci: remove asm/pgtable.h include [media] tda829x: fix regression in probe functions [media] mceusb: don't claim multifunction device non-IR parts [media] nuvoton-cir: fix wake from suspend [media] cx18: Add support for Hauppauge HVR-1600 models with s5h1411 [media] ivtv: Fix corrective action taken upon DMA ERR interrupt to avoid hang [media] cx25840: fix probing of cx2583x chips [media] cx23885: Remove unused 'err:' labels to quiet compiler warning [media] cx23885: Revert "Check for slave nack on all transactions" [media] DiB7000M: add pid filtering [media] Fix sysfs rc protocol lookup for rc-5-sz [media] au0828: fix VBI handling when in V4L2 streaming mode [media] ir-raw: Properly initialize the IR event (BZ#27202) [media] s2255drv: firmware re-loading changes [media] Fix double free of video_device in mem2mem_testdev [media] DM04/QQBOX memcpy to const char fix		2011-03-10 13:22:10 -08:00
..
common	[media] tda829x: fix regression in probe functions	2011-03-02 14:18:12 -03:00
dvb	[media] mantis_pci: remove asm/pgtable.h include	2011-03-03 10:15:35 -03:00
radio	[media] radio-aimslab.c needs #include <linux/delay.h>	2011-01-19 11:45:57 -02:00
rc	Merge branch 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2011-03-10 13:22:10 -08:00
video	[media] cx18: Add support for Hauppauge HVR-1600 models with s5h1411	2011-03-02 13:45:56 -03:00
Kconfig	[media] dabusb: Move it to staging to be deprecated	2010-12-29 08:17:15 -02:00
Makefile	[media] rename drivers/media/IR to drives/media/rc	2010-12-29 08:16:36 -02:00