Merge branch 'fix/sgtl5000' of...

Merge branch 'fix/sgtl5000' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-sgtl5000

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