Merge branch 'reset/lookup' of git://git.pengutronix.de/git/pza/linux into clk-davinci
authorStephen Boyd <sboyd@kernel.org>
Fri, 6 Apr 2018 20:36:50 +0000 (13:36 -0700)
committerStephen Boyd <sboyd@kernel.org>
Fri, 6 Apr 2018 20:36:50 +0000 (13:36 -0700)
commitac8e5cc73736fe1ec6c7f3674ee71f7c99c42ae0
treee854a9878470a883cd678d4ee6f1b1d598e0030e
parentfc3fcb4ff1960e9f0b72b1d4855f7e0bcf18b7f2
parente2749bb998701e21cdb8b34486b82fc1c051ab41
Merge branch 'reset/lookup' of git://git.pengutronix.de/git/pza/linux into clk-davinci

We need this to be able to use the reset_controller_add_lookup() API.

* 'reset/lookup' of git://git.pengutronix.de/git/pza/linux:
  reset: modify the way reset lookup works for board files
  reset: add support for non-DT systems