diff options
author | Mark Brown <broonie@kernel.org> | 2016-03-13 15:19:35 +0700 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-03-13 15:19:35 +0700 |
commit | d1f83021d5ca993242105f7b41f924614501fce5 (patch) | |
tree | 88d0376d25a9706f8d2094bf51e2deb609d8584a /Documentation/zorro.txt | |
parent | 92aa18f88c1204c95ef42ed06a57a37ba7e34951 (diff) | |
parent | 354794dacc213da7596cefea4dbcd8c094368807 (diff) | |
parent | ab7cad331155bab5e81381b5e34a333220718385 (diff) | |
parent | 0258382bf3985b736dde51a456a5a3c2cf7af958 (diff) | |
parent | 4618119b9be5f5075daf995b2ab807088b14961c (diff) | |
parent | 7e6213f4345c3798b7fb7af41d221e2fd77ec6a6 (diff) | |
download | linux-d1f83021d5ca993242105f7b41f924614501fce5.tar.gz linux-d1f83021d5ca993242105f7b41f924614501fce5.tar.bz2 linux-d1f83021d5ca993242105f7b41f924614501fce5.zip |
Merge remote-tracking branches 'regulator/topic/discharge', 'regulator/topic/fan53555', 'regulator/topic/gpio', 'regulator/topic/hi655x' and 'regulator/topic/lp872x' into regulator-next