diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-14 14:13:25 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-14 14:13:25 +0100 |
| commit | 7d9aca39dcacd2b3f42e2e287162329f410f93e1 (patch) | |
| tree | 2907b680b2b7625226f46d23d74ccc9c58ad0362 /Kconfig | |
| parent | Merge remote-tracking branches 'regmap/topic/core' and 'regmap/topic/devm' in... (diff) | |
| parent | mfd: Improve performance of later WM1811 revisions (diff) | |
| download | linux-7d9aca39dcacd2b3f42e2e287162329f410f93e1.tar.xz linux-7d9aca39dcacd2b3f42e2e287162329f410f93e1.zip | |
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
Diffstat (limited to 'Kconfig')
0 files changed, 0 insertions, 0 deletions