| commit | b87d07b13c779c42e4929e590003c9eb8c2f06fa | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Tue Nov 27 20:06:08 2012 +0000 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Tue Nov 27 20:06:08 2012 +0000 |
| tree | 9fbe55b61e176e783e5c6d6063733079d0274948 | |
| parent | 77b71b370ed06c75bdebef09be438d5275f70fc1 [diff] | |
| parent | 8dc995f56ef7aedb41873fdeaa1971f3aa166ebd [diff] |
Merge branch 'topic/hotplug' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-max8997 Conflicts: drivers/regulator/max8997.c