Merge tag 'mvebu-fixes-4.12-1' of git://git.infradead.org/linux-mvebu into fixes

mvebu fixes for 4.12

Fix the interrupt description of the crypto node for device tree of
the Armada 7K/8K SoCs

* tag 'mvebu-fixes-4.12-1' of git://git.infradead.org/linux-mvebu: (316 commits)
  arm64: marvell: dts: fix interrupts in 7k/8k crypto nodes
  + Linux 4.12-rc2

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined MAINTAINERS
index b66d6dd4cd70a78727c3ddcfe3ff10f589c4d256,9e984645c4b08b9e20ebc839704a5d25b0c32032..ef1fe4ed3a0c33aa8a089534184e6b0cddc6d84d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -846,7 -846,6 +846,6 @@@ M: Laura Abbott <labbott@redhat.com
  M:    Sumit Semwal <sumit.semwal@linaro.org>
  L:    devel@driverdev.osuosl.org
  S:    Supported
- F:    Documentation/devicetree/bindings/staging/ion/
  F:    drivers/staging/android/ion
  F:    drivers/staging/android/uapi/ion.h
  F:    drivers/staging/android/uapi/ion_test.h
@@@ -1722,6 -1721,7 +1721,6 @@@ N:      rockchi
  ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
  M:    Kukjin Kim <kgene@kernel.org>
  M:    Krzysztof Kozlowski <krzk@kernel.org>
 -R:    Javier Martinez Canillas <javier@osg.samsung.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
  Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
@@@ -1829,6 -1829,7 +1828,6 @@@ F:      drivers/edac/altera_edac
  ARM/STI ARCHITECTURE
  M:    Patrice Chotard <patrice.chotard@st.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -L:    kernel@stlinux.com
  W:    http://www.stlinux.com
  S:    Maintained
  F:    arch/arm/mach-sti/
@@@ -3114,6 -3115,14 +3113,14 @@@ F:    drivers/net/ieee802154/cc2520.
  F:    include/linux/spi/cc2520.h
  F:    Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
  
+ CCREE ARM TRUSTZONE CRYPTOCELL 700 REE DRIVER
+ M:    Gilad Ben-Yossef <gilad@benyossef.com>
+ L:    linux-crypto@vger.kernel.org
+ L:    driverdev-devel@linuxdriverproject.org
+ S:    Supported
+ F:    drivers/staging/ccree/
+ W:    https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family
+ 
  CEC FRAMEWORK
  M:    Hans Verkuil <hans.verkuil@cisco.com>
  L:    linux-media@vger.kernel.org
@@@ -5693,7 -5702,7 +5700,7 @@@ M:      Alex Elder <elder@kernel.org
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  S:    Maintained
  F:    drivers/staging/greybus/
- L:    greybus-dev@lists.linaro.org
+ L:    greybus-dev@lists.linaro.org (moderated for non-subscribers)
  
  GREYBUS AUDIO PROTOCOLS DRIVERS
  M:    Vaibhav Agarwal <vaibhav.sr@gmail.com>
@@@ -9551,10 -9560,6 +9558,6 @@@ F:     drivers/net/wireless/intersil/orinoc
  
  OSD LIBRARY and FILESYSTEM
  M:    Boaz Harrosh <ooo@electrozaur.com>
- M:    Benny Halevy <bhalevy@primarydata.com>
- L:    osd-dev@open-osd.org
- W:    http://open-osd.org
- T:    git git://git.open-osd.org/open-osd.git
  S:    Maintained
  F:    drivers/scsi/osd/
  F:    include/scsi/osd_*
@@@ -11263,6 -11268,7 +11266,6 @@@ F:   drivers/media/rc/serial_ir.
  
  STI CEC DRIVER
  M:    Benjamin Gaignard <benjamin.gaignard@linaro.org>
 -L:    kernel@stlinux.com
  S:    Maintained
  F:    drivers/staging/media/st-cec/
  F:    Documentation/devicetree/bindings/media/stih-cec.txt