From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 17 Jul 2011 19:48:18 +0000 (-0700)
Subject: Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: firefly_0821_release~3680^2~5044
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=54a772b8aace3df8ad6af0bd0748f57d27f72b1d;p=firefly-linux-kernel-4.4.55.git

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

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  [media] tuner-core: fix a 2.6.39 regression with mt20xx
  [media] dvb_frontend: fix race condition in stopping/starting frontend
  [media] media: fix radio-sf16fmr2 build when SND is not enabled
  [media] MEDIA: Fix non-ISA_DMA_API link failure of sound code
  [media] nuvoton-cir: make idle timeout more sane
  [media] mceusb: increase default timeout to 100ms
  [media] mceusb: Timeout unit corrections
  [media] Revert "V4L/DVB: cx23885: Enable Message Signaled Interrupts(MSI)"
---

54a772b8aace3df8ad6af0bd0748f57d27f72b1d