diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-07-14 17:18:22 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-14 17:18:22 +0200 |
| commit | 8ebe624ab3e3e1a1bd63a8912bdaa4924a59a87a (patch) | |
| tree | 1f3e48efceb94c2a87c7857d707b433fb461ebef /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
| parent | ad22ac34c02e1337c04ada10a36e8f70acfbb8b5 (diff) | |
| parent | 79795e20a184ebabf4ae743d1506cc39783caa46 (diff) | |
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
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
0 files changed, 0 insertions, 0 deletions