From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 14 Jul 2016 15:18:22 +0000 (+0200)
Subject: Merge branch 'reset/for-4.8-2' into next/dt64
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8ebe624ab3e3e1a1bd63a8912bdaa4924a59a87a;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'reset/for-4.8-2' into next/dt64

This is required to avoid a 'make dtbs' failure:

arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi:47:56: fatal error: dt-bindings/reset/amlogic,meson-gxbb-reset.h: No such file or directory

The dependency was not handled right earlier, I'm fixing up the branch here
to minimize the bisection problem.

* reset/for-4.8-2:
  dt-bindings: reset: Add bindings for the Meson SoC Reset Controller
  reset: Add support for the Amlogic Meson SoC Reset Controller
  reset: Return -ENOTSUPP when not configured
  reset: oxnas: Use devm register API and get rid of platform remove
  reset: fix Kconfig menu to include reset drivers in sub-menu
  reset: zynq: use devm_reset_controller_register()
  reset: socfpga: use devm_reset_controller_register()
  reset: sunxi: use devm_reset_controller_register()
  reset: pistachio: use devm_reset_controller_register()
  reset: ath79: use devm_reset_controller_register()
  reset: add devm_reset_controller_register API
---

8ebe624ab3e3e1a1bd63a8912bdaa4924a59a87a