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 /drivers/net/ethernet/cavium/thunder/nic.h | |
parent | Merge remote-tracking branches 'regulator/topic/mt6397', 'regulator/topic/of', 'regulator/topic/pv88060', 'regulator/topic/pwm' and 'regulator/topic/s2mps11' into regulator-next (diff) | |
parent | regulator: s5m8767: fix get_register() error handling (diff) | |
parent | regulator: vexpress: rename vexpress regulator implementation (diff) | |
download | linux-dev-768e66686cfe83f786f6ae26f1799cca69e80523.tar.xz linux-dev-768e66686cfe83f786f6ae26f1799cca69e80523.zip |
Merge remote-tracking branches 'regulator/topic/s5m8767' and 'regulator/topic/vexpress' into regulator-next