summaryrefslogtreecommitdiff
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-10 21:16:02 +0300
committerMark Brown <broonie@kernel.org>2015-04-10 21:16:02 +0300
commit3984c9da458dbdc352a82909a51c42cf2860a4a5 (patch)
tree7ff027070e8c74f54ed5c94a78f740880c8d6bab /drivers/watchdog
parente5073849f9d78cd091dccc2a993c0fa5d65f0014 (diff)
parentaf78114ec757cea281aafa3433a3a2e211e2eb67 (diff)
parent2b85c28a5a7cb0f6bf5899125437812e67e02f70 (diff)
parenteb2d90c058280b41c8493cb17271e053b5ebba39 (diff)
parentc0cf5a59fb69527151eb8e332a1b9660200f66c6 (diff)
downloadlinux-3984c9da458dbdc352a82909a51c42cf2860a4a5.tar.xz
Merge remote-tracking branches 'regulator/topic/dbx500', 'regulator/topic/load-op', 'regulator/topic/max77693' and 'regulator/topic/max8660' into regulator-next