diff options
author | Mark Brown <broonie@kernel.org> | 2015-03-23 11:43:42 -0700 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-23 11:43:42 -0700 |
commit | 1401990e8cf82741ddffd02979a77407c0acfbeb (patch) | |
tree | 75de4118a9f86444dc6313798126bc45a7507e42 /include | |
parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
parent | cf39284d41f67964cf42b21bb386c012cf5b7f65 (diff) | |
parent | e03826d5045e81a66a4fad7be9a8ecdaeb7911cf (diff) | |
download | linux-1401990e8cf82741ddffd02979a77407c0acfbeb.tar.gz linux-1401990e8cf82741ddffd02979a77407c0acfbeb.tar.bz2 linux-1401990e8cf82741ddffd02979a77407c0acfbeb.zip |
Merge remote-tracking branches 'regulator/fix/doc' and 'regulator/fix/palmas' into regulator-linus