diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-28 19:24:48 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-28 19:24:48 +0000 |
| commit | 5d6e6ffc400dbc3ea0cc58b8b6f9d9ac748d6572 (patch) | |
| tree | f28c0307e82adf901277ae4e877dd2db7b620317 /drivers/md | |
| parent | bd0ec7c1e52423429d9ee7b34e2c899f01db01b0 (diff) | |
| parent | 9997f3ffbbcde01bcd5966eeb26bc41243715021 (diff) | |
| download | talos-op-linux-5d6e6ffc400dbc3ea0cc58b8b6f9d9ac748d6572.tar.gz talos-op-linux-5d6e6ffc400dbc3ea0cc58b8b6f9d9ac748d6572.zip | |
Merge branch 'topic/tps51632' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-min
Conflicts:
drivers/regulator/tps51632-regulator.c
Diffstat (limited to 'drivers/md')
0 files changed, 0 insertions, 0 deletions
