]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'regmap-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Jun 2012 03:57:43 +0000 (06:57 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Jun 2012 03:57:43 +0000 (06:57 +0300)
Pull regmap fixes from Mark Brown:
 "Nothing too exciting - a cleanup for debugfs in error handling and a
  fix for the padding (which has only just acquired real use) and
  exporting a function that's supposed to be usable by drivers."

* tag 'regmap-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: Export regmap_reinit_cache()
  regmap: Fix the size calculation for map->format.buf_size
  regmap: clean up debugfs if regmap_init fails


Trivial merge