diff options
author | Mark Brown <broonie@kernel.org> | 2015-06-22 11:19:56 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-06-22 11:19:56 +0100 |
commit | 733ada000f2c9618ccbac7b9ba146113f0a6675b (patch) | |
tree | 1253fa0449fcc9027f195c76689ad77a70b755f0 /drivers/net/appletalk/cops_ffdrv.h | |
parent | 0460a368ea4caa256a425d1447581ed03f6ae3bd (diff) | |
parent | 130daa3f3570890d9082a06b8c36951a9ef630b6 (diff) | |
parent | ab101e35448b777a62a5e02155783ec93d4c77db (diff) | |
parent | 419d06a1cf58d9b99b25b5f578418b80070043a3 (diff) | |
parent | c751ad0dd640f4ce9269acd7a54de5ba8092e99e (diff) | |
download | blackbird-obmc-linux-733ada000f2c9618ccbac7b9ba146113f0a6675b.tar.gz blackbird-obmc-linux-733ada000f2c9618ccbac7b9ba146113f0a6675b.zip |
Merge remote-tracking branches 'regulator/topic/of', 'regulator/topic/pwm', 'regulator/topic/qcom' and 'regulator/topic/soft-start' into regulator-next