From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 31 Oct 2016 17:12:35 +0000 (-0700)
Subject: Merge tag 'regmap-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=80a306d6faa72a7724b0b9f440a116f6e85eaec5

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

80a306d6faa72a7724b0b9f440a116f6e85eaec5