From: Linus Torvalds Date: Fri, 11 Jan 2008 21:46:46 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb X-Git-Tag: firefly_0821_release~23842 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d0c4c9d4a2e46f052178806c4004d52cd3ae040f;p=firefly-linux-kernel-4.4.55.git Merge git://git./linux/kernel/git/mchehab/v4l-dvb * git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (7001): av7110: fix section mismatch V4L/DVB (6999): ivtv: stick to udelay=10 after all --- d0c4c9d4a2e46f052178806c4004d52cd3ae040f