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)
* '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

1  2 
MAINTAINERS
drivers/base/Makefile

diff --cc MAINTAINERS
Simple merge
Simple merge