diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-08 15:55:53 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-08 15:55:53 +0900 |
| commit | 555fedacc366c4aaf48270da2504dfa97c41a130 (patch) | |
| tree | ae9b506b00233b0fee7d29c85b2db097e236d5e4 /include/trace | |
| parent | 2547e201b3693f91d643fc0d21ef86171894b59b (diff) | |
| parent | 40c5cc263954444f5a76cbf25d408c42da480122 (diff) | |
| parent | 18694886bddb2d4d905535a0149aeef3b5f9c936 (diff) | |
Merge branches 'regmap-linus' and 'regmap-interface' into regmap-next