Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Jul 2011 18:14:47 +0000 (11:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Jul 2011 18:14:47 +0000 (11:14 -0700)
commitf5fc87905ea075a0b14878086fd4fe38be128844
tree09d7ad146b737caefb472534de95ef53f95d7e65
parentd4e06701b89286a306b31e20ec69a904fae374a1
parent90923351d480fffd0d24646db83f6f8315eed0d9
Merge branch 'for-linus' of git://git./linux/kernel/git/broonie/regmap

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regulator: Convert tps65023 to use regmap API
  regmap: Add SPI bus support
  regmap: Add I2C bus support
  regmap: Add generic non-memory mapped register access API
MAINTAINERS
drivers/base/Makefile