From: Kevin Hilman <khilman@linaro.org>
Date: Wed, 9 Sep 2015 22:41:42 +0000 (-0700)
Subject: Merge tag 'reset-for-4.3-fixes' of git://git.pengutronix.de/git/pza/linux into driver... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9738031561d246f625325badb03a1f1eca2d1b01;p=linux-beck.git

Merge tag 'reset-for-4.3-fixes' of git://git.pengutronix.de/git/pza/linux into drivers/reset

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
---

9738031561d246f625325badb03a1f1eca2d1b01