diff options
| author | Mark Brown <broonie@kernel.org> | 2016-03-13 15:20:14 +0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-13 15:20:14 +0700 |
| commit | 768e66686cfe83f786f6ae26f1799cca69e80523 (patch) | |
| tree | 20fa94fa5b301586c43cce08165f99781203fbf0 /fs/jffs2 | |
| parent | 41eeb34acd3def009b1dd827364c9ed6d70ca4ea (diff) | |
| parent | e07ff9434167981c993a26d2edbbcb8e13801dbb (diff) | |
| parent | 935514c961310558ee0767e73e678b85ac37a68d (diff) | |
Merge remote-tracking branches 'regulator/topic/s5m8767' and 'regulator/topic/vexpress' into regulator-next