git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4633511 a43fd50 632a5b0)
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)
Conflicts (trivial context stuff):
drivers/base/regmap/regmap.c
include/linux/regmap.h


Trivial merge
Pandora Kernel Repository