Merge branch 'for-2.6.30' into for-2.6.31

Browse source

...

This commit is contained in:

Mark Brown 2009-04-13 15:12:48 +01:00

parent f2644a2c00 6e498d5eb6

commit 9b1a88c710

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

10

sound/soc/codecs/twl4030.c

View file

12

sound/soc/fsl/fsl_dma.c

View file

2

sound/soc/pxa/magician.c

View file

6

sound/soc/s3c24xx/Kconfig

View file