Merge remote-tracking branch 'asoc/fix/arizona' into asoc-arizona

Browse source

Conflicts:
	sound/soc/codecs/arizona.c

...

This commit is contained in:

Mark Brown 2013-01-17 15:31:54 +09:00

parent c98137bfcb b59e0f82aa

commit 4706ccbbe8

1 changed files with 1 additions and 1 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

2

sound/soc/codecs/arizona.c

View file