diff options

author	Mark Brown <broonie@kernel.org>	2016-11-04 12:16:38 -0600
committer	Mark Brown <broonie@kernel.org>	2016-11-04 12:16:38 -0600
commit	cc9b94029e9ef51787af908e9856b1eed314bc00 (patch)
tree	9675310b89d0f6fb1f7bd9423f0638c4ee5226fd /include/keys
parent	13bed58ce8748d430a26e353a09b89f9d613a71f (diff)
parent	1b5b42216469b05ef4b5916cb40b127dfab1da88 (diff)

Merge branch 'topic/error' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-fixed

Diffstat (limited to 'include/keys')