Merge branch 'fix/sgtl5000' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Mon, 20 Oct 2014 11:36:02 +0000 (12:36 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 20 Oct 2014 11:36:02 +0000 (12:36 +0100)
Conflicts:
Documentation/devicetree/bindings/sound/sgtl5000.txt


Trivial merge