From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Sep 2011 02:29:45 +0000 (-0700)
Subject: Merge branch 'v4l_for_linus' of git://linuxtv.org/mchehab/for_linus
X-Git-Tag: Ubuntu-5.0.0-8.9~17620
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7409b7132ca96d01b373541d788e8c5893bec1f3;p=mirror_ubuntu-disco-kernel.git

Merge branch 'v4l_for_linus' of git://linuxtv.org/mchehab/for_linus

* '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
---

7409b7132ca96d01b373541d788e8c5893bec1f3