Merge branch 'topic/voltage-ev' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorKevin Hilman <khilman@linaro.org>
Thu, 25 Sep 2014 16:57:57 +0000 (09:57 -0700)
committerKevin Hilman <khilman@linaro.org>
Thu, 25 Sep 2014 16:57:57 +0000 (09:57 -0700)

Trivial merge