diff options
| author | Mark Brown <broonie@kernel.org> | 2016-01-12 18:26:03 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-01-12 18:26:03 +0000 |
| commit | 353915f0b43fb156c3bf02d54d9f3dbdcbe66afe (patch) | |
| tree | c1043c8eb9803b01105f30c2efac7beafdc75bfa /block/blk-map.c | |
| parent | 3ad4b0517b6510a53d791f9ead531a08bda3bcdd (diff) | |
| parent | 3cb99e2ea99a454c8837a55aac88753ef05fc1eb (diff) | |
| parent | aab3c3f34cc2dd8230052770712606d65de6538f (diff) | |
Merge remote-tracking branches 'regulator/fix/axp20x' and 'regulator/fix/mt6311' into regulator-linus