Merge branch 'reset/for_v3.15' of git://git.pengutronix.de/git/pza/linux into next/drivers

Merge "reset controller fixes and updates" from Philipp Zabel:

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

:
  reset: Add optional resets and stubs
  reset: Add of_reset_control_get
  reset: Mark function as static and remove unused function in core.c
  reset: allow drivers to request probe deferral

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