From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 14 Sep 2016 22:12:30 +0000 (+0200)
Subject: Merge tag 'amlogic-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman... 
X-Git-Tag: v4.9-rc1~77^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5895b53d41499434160865f405f8ddfa1810380;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'amlogic-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/drivers

Pull "Amlogic drivers for v4.9" from Kevin Hilman:

- add secure monitor and eFuse driver
- add IR remote driver

* tag 'amlogic-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  nvmem: amlogic: Add Amlogic Meson EFUSE driver
  firmware: Amlogic: Add secure monitor driver
  media: rc: meson-ir: Add support for newer versions of the IR decoder
---

f5895b53d41499434160865f405f8ddfa1810380