]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge tag 'reset-for-4.11-2' of git://git.pengutronix.de/pza/linux into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Tue, 7 Feb 2017 16:18:29 +0000 (17:18 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 7 Feb 2017 16:18:29 +0000 (17:18 +0100)
commit57ac490466a5f9f703a9183a8583df1d9660ce0c
tree9e6a856e691c8d7d3801bd0cd96668042cdad8a0
parent1096ffd75aa50fc27d74a30b336ef2efe0b6cbbf
parent7a1ca76dba35d1a443278811fb67625f0e98a713
Merge tag 'reset-for-4.11-2' of git://git.pengutronix.de/pza/linux into next/drivers

Pull "Reset controller changes for v4.11, part 2" from Philipp Zabel:

- Fix missing NULL check in reset_control_put for optional reset control
  conversion
- Make zx2967 driver explicitly non-modular

* tag 'reset-for-4.11-2' of git://git.pengutronix.de/pza/linux:
  reset: make zx2967 explicitly non-modular
  reset: core: fix reset_control_put