diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-13 16:22:43 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-13 16:22:43 +0300 |
| commit | 93878cd540500884b2ea428f620c8e1426fc4d6d (patch) | |
| tree | 660f209294aa7598c16a84dc465f55792c24d168 /drivers/edac/i7300_edac.c | |
| parent | 5535fc7958efbd68542def0abd6c9e6b3a9e6812 (diff) | |
| parent | 45fa2038cf7820ecfcca8793b81e656ca3caaf0f (diff) | |
| parent | a2151374230820a3a6e654f2998b2a44dbfae4e1 (diff) | |
| download | linux-93878cd540500884b2ea428f620c8e1426fc4d6d.tar.xz | |
Merge remote-tracking branches 'regulator/fix/constrain' and 'regulator/fix/defer' into regulator-linus