diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-26 21:16:17 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-26 21:16:17 +0200 |
| commit | 6580ad3fc1297b63a1248b6f8d6c2fac3d447cd1 (patch) | |
| tree | 526838ffc6d711a7ceaea5509a171b07c332b640 /arch | |
| parent | Linux 3.15-rc6 (diff) | |
| parent | reset: Add of_reset_control_get to reset.h (diff) | |
| download | linux-6580ad3fc1297b63a1248b6f8d6c2fac3d447cd1.tar.xz linux-6580ad3fc1297b63a1248b6f8d6c2fac3d447cd1.zip | |
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
b424080a9e086e683ad5fdc624a7cf3c024e0c0f 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>
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions