]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' into regmap-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 22 Jul 2012 18:26:07 +0000 (19:26 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 22 Jul 2012 18:26:07 +0000 (19:26 +0100)
commit8425d4e6a2c1aea394522b7052fc133feaf11942
tree42a7d1e2f3778adcd13a4376ae9e0810ef6d387b
parent387ccc176a9fe230f6a48c9e877c97af72b62459
parentd302499a29a2a1cae1ea4ad64c2380d277b3f346
parent552aee6663e115c34b68ac64ef44f108d01e6f89
Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' into regmap-next

Conflicts (trivial context stuff):
drivers/base/regmap/regmap.c
include/linux/regmap.h
drivers/base/regmap/regmap-irq.c
drivers/base/regmap/regmap.c
include/linux/regmap.h