From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 27 Aug 2013 17:10:30 +0000 (-0700)
Subject: Merge tag 'regmap-v3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v5.15~19504
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa8218def1b1a16f0a410e2c1c767b4738cc81fa;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'regmap-v3.11-rc7' of git://git./linux/kernel/git/broonie/regmap

Pull regmap fixes from Mark Brown:
 "Two changes here:

   - Fix a bug in the rbtree code which could cause it to create two
     different cache entries for the same register by adding a single
     register at a time to the cache.  This isn't awesome for
     performance but it's non-invasive which we need for this late in
     the release cycle and the I/O costs we're trying to avoid are high.

   - Add another header used in the !CONFIG_REGMAP stubs where we had
     been relying on implicit inclusion"

* tag 'regmap-v3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: rbtree: Fix overlapping rbnodes.
  regmap: Add another missing header for !CONFIG_REGMAP stubs
---

fa8218def1b1a16f0a410e2c1c767b4738cc81fa