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)
commit5aa664d63391c14f52264eb08d70f8a074ae249e
tree539134746d006e25f1d893a3a170bb94388bd86e
parent8735779774b8bbe14456c9e6ba4525eefc67a228
parentc171b120c327e41278fc55d0b3d44be109dbf8c3
Merge branch 'fix/sgtl5000' of git://git./linux/kernel/git/broonie/sound into asoc-sgtl5000

Conflicts:
Documentation/devicetree/bindings/sound/sgtl5000.txt
Documentation/devicetree/bindings/sound/sgtl5000.txt