From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Feb 2012 20:32:51 +0000 (-0800)
Subject: Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e98092bedcfff1908ad7a32acc46f13e4d8b2f43;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'v4l_for_linus' of git://git./linux/kernel/git/mchehab/linux-media

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] hdpvr: update picture controls to support firmware versions > 0.15
  [media] wl128x: fix build errors when GPIOLIB is not enabled
  [media] hdpvr: fix race conditon during start of streaming
  [media] omap3isp: Fix crash caused by subdevs now having a pointer to devnodes
  [media] imon: don't wedge hardware after early callbacks
---

e98092bedcfff1908ad7a32acc46f13e4d8b2f43