| commit | 463e8474af8317c3bfc0dc95b0d003e11e847b40 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Thu Mar 27 01:28:19 2014 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Thu Mar 27 01:28:19 2014 +0100 |
| tree | e83b8de6826d81e5f01f26cb486fbc82bb5e8169 | |
| parent | b80a6373d6cf7cbd22498409cef7883d7f8209c4 [diff] | |
| parent | b424080a9e086e683ad5fdc624a7cf3c024e0c0f [diff] |
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>