projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit1644de03cbc05b70d0283c570b75fe9339b375b7
treeda77c17c775e3fb2138e0c43e3013e8bec6c83a4tree | snapshot (tar.gz zip)
parent182e0842b0109aa934f1fe76b96d3a79efec3912commit | diff
parent4113652252fad972e0c191b1e536dc74a6faebdccommit | 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