From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 11 Sep 2011 21:58:47 +0000 (-0700)
Subject: Merge branch 'v4l_for_linus' of git://linuxtv.org/mchehab/for_linus
X-Git-Tag: v3.1-rc6~7
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=87adf1c66cacbc4acd0e696c896755a5091a9d3d;p=~emulex%2Finfiniband.git

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

* 'v4l_for_linus' of git://linuxtv.org/mchehab/for_linus:
  [media] vp7045: fix buffer setup
  [media] nuvoton-cir: simplify raw IR sample handling
  [media] [Resend] viacam: Don't explode if pci_find_bus() returns NULL
  [media] v4l2: Fix documentation of the codec device controls
  [media] gspca - sonixj: Fix the darkness of sensor om6802 in 320x240
  [media] gspca - sonixj: Fix wrong register mask for sensor om6802
  [media] gspca - ov519: Fix LED inversion of some ov519 webcams
  [media] pwc: precedence bug in pwc_init_controls()
---

87adf1c66cacbc4acd0e696c896755a5091a9d3d