diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-20 02:39:55 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-20 02:39:55 +0100 |
| commit | ce6dd5da9dfcf9232df09d8d486cd6ed25e29cdc (patch) | |
| tree | 5ab56a65bd6b52ae690b16d395c4d15599f43c7c /fs/ubifs/lprops.c | |
| parent | regulator: remove use of __devinit (diff) | |
| parent | mfd: tps6586x: move regulator dt parsing to regulator driver (diff) | |
| download | linux-ce6dd5da9dfcf9232df09d8d486cd6ed25e29cdc.tar.xz linux-ce6dd5da9dfcf9232df09d8d486cd6ed25e29cdc.zip | |
Merge branch 'topic/tps6586x' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-hotplug
Conflicts:
drivers/regulator/tps6586x-regulator.c
Diffstat (limited to 'fs/ubifs/lprops.c')
0 files changed, 0 insertions, 0 deletions