| commit | eae4b51b21f7452b0b53a9848f48c02cb0fac336 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Wed Mar 14 13:15:03 2012 +0000 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Wed Mar 14 13:15:03 2012 +0000 |
| tree | 20d54023bf32e061866c83565d44d694e2598ba5 | |
| parent | 4a6be7bb7474500a69f6d8f25899b8038491bdbb [diff] | |
| parent | a6539c32949063c8147905512a83a98842c2d254 [diff] |
Merge remote-tracking branch 'regmap/topic/introspection' into regmap-next Simple add/add conflict: drivers/base/regmap/regmap.c