Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-new-pcm

Browse source

Trivial add/add conflicts:
	sound/soc/codecs/Kconfig
	sound/soc/codecs/Makefile

...

This commit is contained in:

Mark Brown 2013-08-05 18:12:39 +01:00

parent 13b02fa0db 95169d080f

commit 6c3137fd01

4 changed files with 334 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

15

Documentation/devicetree/bindings/sound/ti,pcm1681.txt

View file

4

sound/soc/codecs/Kconfig

View file

2

sound/soc/codecs/Makefile

View file

313

sound/soc/codecs/pcm1681.c

View file