Merge branch 'reset/fixes' of git://git.pengutronix.de/git/pza/linux into next/fixes-non-critical

Merge a fix from Philipp Zabel:

This patch fixes an erroneous revert that slipped in with commit
b424080a reset: Add optional resets and
stubs.

* 'reset/fixes' of git://git.pengutronix.de/git/pza/linux

:
  reset: Add of_reset_control_get to reset.h

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