Merge remote-tracking branches 'regulator/topic/s5m8767', 'regulator/topic/stub'...
authorMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:12 +0000 (17:08 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:12 +0000 (17:08 +0100)
commitb58e917bf9eadf1efbbebe49f13235c56f0c2c4f
treeff92093df139ce4296d1784a7c21e7c0a0391d3a
parent4c04ef25b8aae6b5a8c4cc5c0235fc5d239209fd
parenteba430c7eac10964e4ffd5df525bf2abc9e76b48
parentd660e92a97aac08aa33cd41e00a325066e00f1ef
parentc122c5b68273cf0153d1dc510889728cf71e8ce3
parent5957ae1fdc50de61d08735d7132ae4f70ae357f7
parent5ab9be4274a12ef56fbf8cd965516f7d1f7868c6
Merge remote-tracking branches 'regulator/topic/s5m8767', 'regulator/topic/stub', 'regulator/topic/tps65090', 'regulator/topic/tps65217' and 'regulator/topic/tps65218' into regulator-next
include/linux/regulator/consumer.h