From: Linus Torvalds Date: Thu, 3 Jul 2008 02:23:52 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb X-Git-Tag: v2.6.26-rc9~72 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3a57a788757738b8f80a82d4f5101fefb8fd7a58;p=platform%2Fkernel%2Flinux-stable.git Merge git://git./linux/kernel/git/mchehab/v4l-dvb * git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (8178): uvc: Fix compilation breakage for the other drivers, if uvc is selected V4L/DVB (8145a): USB Video Class driver --- 3a57a788757738b8f80a82d4f5101fefb8fd7a58