Merge branch 'for-2.6.39' into for-2.6.40

Browse source

...

This commit is contained in:

Mark Brown 2011-03-26 17:25:22 +00:00

parent 312158718f e1bb31b444

commit a0b1550677

4 changed files with 29 additions and 13 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

16

include/sound/soc-dapm.h

View file

14

sound/soc/codecs/sgtl5000.c

View file

9

sound/soc/imx/imx-pcm-dma-mx2.c

View file

3

sound/soc/imx/imx-ssi.h

View file