diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 20:06:08 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 20:06:08 +0000 |
| commit | b87d07b13c779c42e4929e590003c9eb8c2f06fa (patch) | |
| tree | 9fbe55b61e176e783e5c6d6063733079d0274948 /tools/perf/scripts/python | |
| parent | regulator: add device tree support for max8997 (diff) | |
| parent | regulator: remove use of __devexit (diff) | |
| download | linux-b87d07b13c779c42e4929e590003c9eb8c2f06fa.tar.gz linux-b87d07b13c779c42e4929e590003c9eb8c2f06fa.zip | |
Merge branch 'topic/hotplug' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-max8997
Conflicts:
drivers/regulator/max8997.c
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions