]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'reset-for-4.3-fixes' of git://git.pengutronix.de/git/pza/linux into driver...
authorKevin Hilman <khilman@linaro.org>
Wed, 9 Sep 2015 22:41:42 +0000 (15:41 -0700)
committerKevin Hilman <khilman@linaro.org>
Wed, 9 Sep 2015 22:41:42 +0000 (15:41 -0700)
Merge "Reset controller fixes for v4.3" from Philipp Zabel:

Reset controller fixes for v4.3

- added stubs to avoid build breakage in COMPILE_TEST
  configurations with RESET_CONTROLLER disabled
- fixed missing spinlock initialization in ath79 driver

* tag 'reset-for-4.3-fixes' of git://git.pengutronix.de/git/pza/linux:
  reset: ath79: Fix missing spin_lock_init
  reset: Add (devm_)reset_control_get stub functions


Trivial merge