git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1c1c69 a0cc020)
Merge remote-tracking branch 'regmap/topic/drivers' into regmap-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 14 Mar 2012 13:13:25 +0000 (13:13 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 14 Mar 2012 13:13:25 +0000 (13:13 +0000)
Resolved simple add/add conflicts:
drivers/base/regmap/internal.h
drivers/base/regmap/regmap.c


Trivial merge
Pandora Kernel Repository