diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-12 12:10:25 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-12 12:10:25 +0200 |
| commit | 5949a7e9ab2db04edaeee7c368eb4c99131f4629 (patch) | |
| tree | 13e8da5dc42cc62b9721659c41045d2c27c31cc3 /scripts/Makefile.modpost | |
| parent | Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/regma... (diff) | |
| parent | regulator: twl-regulator: make TWL4030_ALLOW_UNSUPPORTED more configurable. (diff) | |
| download | linux-5949a7e9ab2db04edaeee7c368eb4c99131f4629.tar.xz linux-5949a7e9ab2db04edaeee7c368eb4c99131f4629.zip | |
Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next
Conflicts:
drivers/regulator/88pm8607.c (simple overlap with a bugfix in v3.4)
Diffstat (limited to 'scripts/Makefile.modpost')
0 files changed, 0 insertions, 0 deletions