Merge tag 'reset-for-4.7' of git://git.pengutronix.de/git/pza/linux into next/drivers
authorOlof Johansson <olof@lixom.net>
Wed, 13 Apr 2016 18:11:11 +0000 (11:11 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 13 Apr 2016 18:11:11 +0000 (11:11 -0700)
commitf8ed1e1a452645241a7fb6410fb462dcac869311
tree5f51c7ff032ccf8fe6b5f182feeb031529451ef9
parentf6396838bdb3766d291abd7dd8d2efbaa23c8cf7
parent773fe72630c8aca874ec8a07ebacace4ae305a02
Merge tag 'reset-for-4.7' of git://git.pengutronix.de/git/pza/linux into next/drivers

Reset controller changes for v4.7

- add support for shared reset controls
- remove global variables from the lpc18xx driver

* tag 'reset-for-4.7' of git://git.pengutronix.de/git/pza/linux:
  reset: lpc18xx: get rid of global variables for restart notifier
  reset: Add support for shared reset controls
  reset: Share struct reset_control between reset_control_get calls
  reset: Make [of_]reset_control_get[_foo] functions wrappers

Signed-off-by: Olof Johansson <olof@lixom.net>