Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jul 2008 02:23:52 +0000 (19:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jul 2008 02:23:52 +0000 (19:23 -0700)
commit3a57a788757738b8f80a82d4f5101fefb8fd7a58
tree697a0e37cc3c7d02412f6743f52156897f7ba553
parenta16b4bcd31a73a81b6d2b8ffa6b5f6ed01cf6d64
parent06f3ed23b1e1038da649c4836b51fe035f5536bd
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