diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-05-09 16:32:29 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-05-09 16:32:29 +0200 |
| commit | 1644de03cbc05b70d0283c570b75fe9339b375b7 (patch) | |
| tree | da77c17c775e3fb2138e0c43e3013e8bec6c83a4 /Documentation/misc-devices | |
| parent | 182e0842b0109aa934f1fe76b96d3a79efec3912 (diff) | |
| parent | 4113652252fad972e0c191b1e536dc74a6faebdc (diff) | |
Merge tag 'reset-for-4.7-2' of git://git.pengutronix.de/git/pza/linux into next/drivers
Merge "Reset controller changes for v4.7" from Philipp Zabel:
- add missing stub for device_reset
- add support for OXNAS SoCs
* tag 'reset-for-4.7-2' of git://git.pengutronix.de/git/pza/linux:
reset: Add missing function stub for device_reset
dt-bindings: Add Oxford Semiconductor Reset Controller bindings
reset: Add Oxford Semiconductor Reset Controller driver
Diffstat (limited to 'Documentation/misc-devices')
0 files changed, 0 insertions, 0 deletions