projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 182e084 4113652)
Merge tag 'reset-for-4.7-2' of git://git.pengutronix.de/git/pza/linux into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Mon, 9 May 2016 14:32:29 +0000 (16:32 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 9 May 2016 14:32:29 +0000 (16:32 +0200)
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


Trivial merge