Commit d5381e42 authored Apr 18, 2011 by Mark Brown

ASoC: Merge branch 'for-2.6.39' into for-2.6.40

Fix trivial conflict caused by silly spelling fix patch.

Conflicts:
	sound/soc/codecs/wm8994.c

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please to comment