Merge branch 'pm-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorMark Brown <broonie@linaro.org>
Thu, 6 Mar 2014 04:43:51 +0000 (12:43 +0800)
committerMark Brown <broonie@linaro.org>
Thu, 6 Mar 2014 04:43:51 +0000 (12:43 +0800)

Trivial merge