Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next

Browse source

...

This commit is contained in:

Mark Brown 2014-03-13 14:19:45 +00:00

parent 7d50141421 079942abb3

commit 3025df7f04

2 changed files with 25 additions and 44 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

34

sound/soc/pxa/magician.c

View file

35

sound/soc/pxa/tosa.c

View file