Merge branch 'fix/max98090' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Sun, 28 Sep 2014 11:22:30 +0000 (12:22 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 28 Sep 2014 11:22:30 +0000 (12:22 +0100)

Trivial merge