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

Browse source

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

...

This commit is contained in:

Mark Brown 2014-10-20 12:36:02 +01:00

parent 8735779774 c171b120c3

commit 5aa664d633

1 changed files with 10 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

Documentation/devicetree/bindings/sound/sgtl5000.txt

View file