Merge tag 'regmap-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 31 Oct 2016 17:12:35 +0000 (10:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 31 Oct 2016 17:12:35 +0000 (10:12 -0700)
commit80a306d6faa72a7724b0b9f440a116f6e85eaec5
tree7a283aea45b320212be0039e46315b6de9cb5cc6
parent6eb3c6046838cd38fc0a6897e5d8b9a882aadcdd
parent74e3368de87d5efb439b17d8e5108ebaf08224c2
Merge tag 'regmap-fix-v4.9-rc3' of git://git./linux/kernel/git/broonie/regmap

Pull regmap fixes from Mark Brown:
 "A couple of small build fixes here, nothing major.

  The missing include is triggered in some configurations and the
  renaming of ret is defensive for the benefit of some drivers people
  are in the process of mainlining"

* tag 'regmap-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: Rename ret variable in regmap_read_poll_timeout
  regmap: include <linux/delay.h> from include/linux/regmap.h