From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Mar 2018 17:59:38 +0000 (-0700)
Subject: Merge tag 'media/v4.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v4.16-rc7~16
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cde00d2169b1f66349e1e89e2ef775f47e6ef27d;p=users%2Fdwmw2%2Flinux.git

Merge tag 'media/v4.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:
 "Three fixes:

   - dvb: fix a Kconfig typo on a help text

   - tegra-cec: reset rx_buf_cnt when start bit detected

   - rc: lirc does not use LIRC_CAN_SEND_SCANCODE feature"

* tag 'media/v4.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: dvb: fix a Kconfig typo
  media: tegra-cec: reset rx_buf_cnt when start bit detected
  media: rc: lirc does not use LIRC_CAN_SEND_SCANCODE feature
---

cde00d2169b1f66349e1e89e2ef775f47e6ef27d