From: Linus Torvalds Date: Fri, 29 Dec 2006 18:06:41 +0000 (-0800) Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=4945b8a553ec735f416596cbf5789c439d16fb38;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'master' of /linux/kernel/git/mchehab/v4l-dvb * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (28 commits) V4L/DVB (5010): Cx88: Fix leadtek_eeprom tagging V4L/DVB (5012): Usbvision fix: It was using "&&" instead "&" V4L/DVB (5001): Add two required headers on kernel 2.6.20-rc1 V4L/DVB (5014): Allyesconfig build fixes on some non x86 arch V4L/DVB (4997): Bttv: delete duplicated ioremap() V4L/DVB (4996): Msp3400: fix kthread_run error check V4L/DVB (4995): Vivi: fix kthread_run() error check V4L/DVB (4994): Vivi: fix use after free in list_for_each() V4L/DVB (4992): Fix typo in saa7134-dvb.c V4L/DVB (4991): Cafe_ccic.c: fix NULL dereference V4L/DVB (4990): Cpia2/cpia2_usb.c: fix error-path leak V4L/DVB (4988): Cx2341x audio_properties is an u16, not u8 V4L/DVB (4984): LOG_STATUS should show the real temporal filter value. V4L/DVB (4983): Force temporal filter to 0 when scaling to prevent ghosting. V4L/DVB (4982): Fix broken audio mode handling for line-in in msp3400. V4L/DVB (4980): Fixes bug 7267: PAL/60 is not working V4L/DVB (4979): Fixes compilation when CONFIG_V4L1_COMPAT is not selected V4L/DVB (4973): Dvb-core: fix printk type warning V4L/DVB (4972): Dvb-core: fix bug in CRC-32 checking on 64-bit systems V4L/DVB (4970): Usbvision memory fixes ... --- 4945b8a553ec735f416596cbf5789c439d16fb38