Merge branch 'for-3.1' into for-3.2

Browse source

...

This commit is contained in:

Mark Brown 2011-08-24 20:22:43 +01:00

parent dff2836707 3bdf28feaf

commit b42af319f2

2 changed files with 4 additions and 4 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/wm8996.c

View file

6

sound/soc/fsl/mpc5200_dma.c

View file