Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 22 Feb 2011 18:38:13 +0000 (10:38 -0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 22 Feb 2011 18:38:13 +0000 (10:38 -0800)
1  2 
sound/soc/codecs/wm8903.h
sound/soc/codecs/wm8994.c

Simple merge
Simple merge