]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'v4l_for_linus' of git://linuxtv.org/mchehab/for_linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Sep 2011 02:29:45 +0000 (19:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Sep 2011 02:29:45 +0000 (19:29 -0700)
* 'v4l_for_linus' of git://linuxtv.org/mchehab/for_linus:
  [media] omap3isp: Fix build error in ispccdc.c
  [media] uvcvideo: Fix crash when linking entities
  [media] v4l: Make sure we hold a reference to the v4l2_device before using it
  [media] v4l: Fix use-after-free case in v4l2_device_release
  [media] uvcvideo: Set alternate setting 0 on resume if the bus has been reset
  [media] OMAP_VOUT: Fix build break caused by update_mode removal in DSS2


Trivial merge