From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 8 Nov 2014 16:45:20 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
X-Git-Tag: v4.0~864
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae04e1ca80318ddf3e3677f2355db1155660f648;p=platform%2Fkernel%2Flinux-amlogic.git

Merge git://git./linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:
 "For:
   - some regression fixes at the Remote Controller core and imon driver
   - a build fix for certain randconfigs with ir-hix5hd2
   - don't feed power to satellite system at ds3000 driver init

  It also contains some fixes for drivers added for Kernel 3.18:
   - some fixes at the new ISDB-S driver, and the corresponding bits to
     fix some descriptors for this Japanese TV standard at the DVB core
   - two warning cleanups for sp2 driver if PM is disabled
   - change the default mode for the new vivid driver"

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] sp2: sp2_init() can be static
  [media] dvb:tc90522: fix always-false expression
  [media] dvb-core: set default properties of ISDB-S
  [media] dvb:tc90522: fix stats report
  [media] vivid: default to single planar device instances
  [media] imon: fix other RC type protocol support
  [media] ir-hix5hd2 fix build warning
  [media] ds3000: fix LNB supply voltage on Tevii S480 on initialization
  [media] rc5-decoder: BZ#85721: Fix RC5-SZ decoding
  [media] rc-core: fix protocol_change regression in ir_raw_event_register
---

ae04e1ca80318ddf3e3677f2355db1155660f648