Merge tag 'reset-for-4.20' of git://git.pengutronix.de/git/pza/linux into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Wed, 10 Oct 2018 11:41:16 +0000 (13:41 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 10 Oct 2018 11:41:22 +0000 (13:41 +0200)
commitf7d87826fe482dbe4b0675f99c1eae2890a2d8fb
tree2640aec2ab83e9958930a7ba9b1738ed5103355e
parentb0a2cea5eb637d540ba86fd31dfd750f26ee0161
parentb790c8ea5593d6dc3580adfad8e117eeb56af874
Merge tag 'reset-for-4.20' of git://git.pengutronix.de/git/pza/linux into next/drivers

Reset controller changes for v4.20

This adds a new driver for the PDC Global (Power Domain Controller)
reset controller found on Qualcomm SDM845 SoCs, fixes a potential
use-after-free issue in reset_controller_dev.of_xlate() callbacks
from __of_reset_control_get(), and trivially fixes a documentation
grammar issue.

* tag 'reset-for-4.20' of git://git.pengutronix.de/git/pza/linux:
  reset: Fix potential use-after-free in __of_reset_control_get()
  reset: qcom: PDC Global (Power Domain Controller) reset controller
  dt-bindings: reset: Add PDC Global binding for SDM845 SoCs
  reset: Grammar s/more then once/more than once/

Signed-off-by: Arnd Bergmann <arnd@arndb.de>