| commit | 7d9aca39dcacd2b3f42e2e287162329f410f93e1 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Wed Mar 14 13:13:25 2012 +0000 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Wed Mar 14 13:13:25 2012 +0000 |
| tree | 2907b680b2b7625226f46d23d74ccc9c58ad0362 | |
| parent | e1c1c69c8fc7656c33460c8e085ac0d0be22ac3b [diff] | |
| parent | a0cc0209abb9fe2b9ab71aa41be70eddd0cbdd61 [diff] |
Merge remote-tracking branch 'regmap/topic/drivers' into regmap-next Resolved simple add/add conflicts: drivers/base/regmap/internal.h drivers/base/regmap/regmap.c