Merge tag 'reset-fixes-for-4.11' of git://git.pengutronix.de/git/pza/linux into fixes
authorOlof Johansson <olof@lixom.net>
Wed, 22 Mar 2017 00:30:51 +0000 (17:30 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 22 Mar 2017 00:30:51 +0000 (17:30 -0700)
commit6014ce8559934580c919485fdc96b4d2d4b18c12
tree239d1159a48d61c88855c42e6721e9feac03b0c6
parent2b259300d2641101847e4ad9ad1723525ad9c476
parent0ca10b60ceeb5372da01798ca68c116ae45a6eb6
Merge tag 'reset-fixes-for-4.11' of git://git.pengutronix.de/git/pza/linux into fixes

Reset controller fixes for v4.11

Fix optional reset_control_get_stubs to return NULL and remove warnings
from reset_control_* stubs.
This fixes commit bb475230b8e5 ("reset: make optional  functions really
optional"), which was merged in reset-for-4.11, and would cause consumer
drivers depending on the new behaviour of optional resets to fail probing
if RESET_CONTROLLER Kconfig option is disabled.

* tag 'reset-fixes-for-4.11' of git://git.pengutronix.de/git/pza/linux:
  reset: fix optional reset_control_get stubs to return NULL

Signed-off-by: Olof Johansson <olof@lixom.net>