Merge branch 'for-3.1' into for-3.2

Browse source

...

This commit is contained in:

Mark Brown 2011-08-22 23:33:01 +01:00

parent 33c5f969b9 c09f5ca7bd

commit 09d930ae51

6 changed files with 19 additions and 14 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

5

sound/soc/ep93xx/ep93xx-i2s.c

View file

2

sound/soc/fsl/fsl_dma.c

View file

18

sound/soc/fsl/mpc8610_hpcd.c

View file

4

sound/soc/fsl/p1022_ds.c

View file

2

sound/soc/kirkwood/kirkwood-i2s.c

View file

2

sound/soc/soc-core.c

View file