Merge branch 'for-2.6.37' into for-2.6.38

Browse source

Conflicts:
	sound/soc/soc-core.c

Axel's fix on two different branches.

...

This commit is contained in:

Mark Brown 2010-12-08 13:54:33 +00:00

parent 6b3ed78535 2a7b1a0020

commit 5a4cfce73b

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

8

sound/soc/codecs/wm8580.c

View file

2

sound/soc/codecs/wm8962.c

View file