Merge branch 'for-3.1' into for-3.2

Browse source

...

This commit is contained in:

Mark Brown 2011-09-05 18:13:31 -07:00

parent 4ed0d012c9 c5d2e650bd

commit 11323e3283

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

4

sound/soc/blackfin/bf5xx-ad193x.c

View file

2

sound/soc/soc-jack.c

View file