From: Arnd Bergmann Date: Sat, 12 Dec 2015 00:22:28 +0000 (+0100) Subject: Merge tag 'reset-for-4.5-2' of git://git.pengutronix.de/git/pza/linux into next/drivers X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bd8f27ba828efa2538bc86010f299a635e79249b;p=deliverable%2Flinux.git Merge tag 'reset-for-4.5-2' of git://git.pengutronix.de/git/pza/linux into next/drivers Merge "Reset controller changes for v4.5 v2" from Philipp Zabel: - oftree support for getting reset devices by index - fixed return value consistency of of_reset_control_get - added support for STi co-processor resets - added STi status callback - added HiSilicon Hi6220 reset driver - added ath79 system restart support - various fixes * tag 'reset-for-4.5-2' of git://git.pengutronix.de/git/pza/linux: reset: ath79: Add system restart support arm64: dts: Add reset dts config for Hisilicon Hi6220 SoC reset: hi6220: Reset driver for hisilicon hi6220 SoC reset: hisilicon: document hisi-hi6220 reset controllers bindings reset: remove unused device pointer from struct reset_control --- bd8f27ba828efa2538bc86010f299a635e79249b