Merge branch 'for-2.6.37' into HEAD

Browse source

...

This commit is contained in:

Mark Brown 2010-11-08 16:52:02 +00:00

parent 0aa34b16f9 b0fc7b8409

commit 8bced69345

2 changed files with 2 additions and 1 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/fsl/mpc5200_psc_i2s.c

View file

1

sound/soc/s3c24xx/Kconfig

View file