diff options
author | Mark Brown | 2014-12-05 11:14:43 +0000 |
---|---|---|
committer | Mark Brown | 2014-12-05 11:14:43 +0000 |
commit | 176488fbc121a4670849f2d10332b0fac333886b (patch) | |
tree | 95cc70519f1f3f28eb46f86e5d24b971c150c328 /include | |
parent | 1b56ffda75ba1400134d9250e8aa0de53ede3629 (diff) | |
parent | f291c74a32509d31731bb82cbb26c64cd430805b (diff) | |
parent | 70b946f9acf4e805361bd877a7e25cc05e497c52 (diff) |
Merge remote-tracking branches 'regulator/topic/sky81452' and 'regulator/topic/stub' into regulator-next