From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 7 Feb 2017 16:18:29 +0000 (+0100)
Subject: Merge tag 'reset-for-4.11-2' of git://git.pengutronix.de/pza/linux into next/drivers
X-Git-Tag: v4.11-rc1~85^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=57ac490466a5f9f703a9183a8583df1d9660ce0c;p=platform%2Fkernel%2Flinux-exynos.git

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
---

57ac490466a5f9f703a9183a8583df1d9660ce0c