diff options
| author | Mark Brown <broonie@kernel.org> | 2015-11-04 11:19:43 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-11-04 11:19:43 +0000 |
| commit | 62e544b983a0a8ec36a33017e1d7eb60eb7ffb5e (patch) | |
| tree | 1b474a9b7a1b17a8c9efa5814a435f80328cab16 /drivers/android/Kconfig | |
| parent | 2dab48ef2b2e8b53373acbe354e7c635b03115e1 (diff) | |
| parent | d9b96d35d2521342fdbcbc7468a0f7dcfaba4147 (diff) | |
| parent | c2f4160b77f1e12b2c05f2253575617faf0c69d0 (diff) | |
| parent | 2d3eda67dd2a02087a2ae6916c92ee1966945b88 (diff) | |
Merge remote-tracking branches 'regulator/topic/supply', 'regulator/topic/tps6105x' and 'regulator/topic/tps65023' into regulator-next