Merge branch 'regmap-linus' into regmap-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 12 Aug 2011 01:43:15 +0000 (10:43 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 12 Aug 2011 01:43:15 +0000 (10:43 +0900)
commit13c54137f7896928ced8e97708d409fa39c09e00
tree4e95e486cbfdb872917984e78484b15f2d84a20e
parent790923e56be795e14eaaeb3305cb4e171cd0a72f
parentb33f9cbd67ba1a1c46879ec66467269f09cde8e5
Merge branch 'regmap-linus' into regmap-next
drivers/base/regmap/regmap-i2c.c
drivers/base/regmap/regmap-spi.c