Merge branch 'reset/for_v3.15' of git://git.pengutronix.de/git/pza/linux into next...
authorArnd Bergmann <arnd@arndb.de>
Thu, 27 Mar 2014 00:28:19 +0000 (01:28 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 27 Mar 2014 00:28:19 +0000 (01:28 +0100)
commit463e8474af8317c3bfc0dc95b0d003e11e847b40
treee83b8de6826d81e5f01f26cb486fbc82bb5e8169
parentb80a6373d6cf7cbd22498409cef7883d7f8209c4
parentb424080a9e086e683ad5fdc624a7cf3c024e0c0f
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>