Merge tag 'regmap-fix-v4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Mar 2015 23:42:54 +0000 (16:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Mar 2015 23:42:54 +0000 (16:42 -0700)
commit7c90de34b23ba69050b3a8fa7e524e871bcf3921
tree43a23c92587fd5e4a7f3abac4395b0e5b8ca89fd
parent90a5a895cc8b284ac522757a01de15e36710c2b9
parentc6b570d97c0e77f570bb6b2ed30d372b2b1e9aae
Merge tag 'regmap-fix-v4.0-rc5' of git://git./linux/kernel/git/broonie/regmap

Pull regmap fix from Mark Brown:
 "This patch fixes a bad interaction between the support that was added
  for having regmaps without devices for early system controller
  initialization and the trace support.

  There's a very good analysis of the actual issue in the commit message
  for the change"

* tag 'regmap-fix-v4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: introduce regmap_name to fix syscon regmap trace events
drivers/base/regmap/regcache.c