Merge branch 'fix/max98090' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Tue, 4 Nov 2014 19:58:58 +0000 (19:58 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 4 Nov 2014 19:58:58 +0000 (19:58 +0000)

Trivial merge