Merge branch 'topic/stac9766' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni...
authorMark Brown <broonie@linaro.org>
Thu, 27 Jun 2013 08:47:04 +0000 (09:47 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 27 Jun 2013 08:47:04 +0000 (09:47 +0100)

Trivial merge