Merge branch 'for-2.6.37' into for-2.6.38

Browse source

...

This commit is contained in:

Mark Brown 2010-11-25 21:16:52 +00:00

parent 77c667d136 25436180ee

commit fdc1f5d060

2 changed files with 11 additions and 6 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

6

sound/soc/codecs/tlv320aic3x.c

View file

11

sound/soc/omap/osk5912.c

View file