]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5ca4e6649a0bd161a2e1999b4d9261cff7f235fb
tree7a283aea45b320212be0039e46315b6de9cb5cc6
parentf8ac2d184bd89233cca0d0033c670f7620ccb1d5
parent527b3f317fa3e536ae60503cf72dd57498a72e8d
Merge tag 'regmap-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/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