Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 19 Nov 2010 11:45:05 +0000 (11:45 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 19 Nov 2010 11:45:05 +0000 (11:45 +0000)
1  2 
sound/soc/codecs/max98088.c
sound/soc/codecs/uda134x.c

Simple merge
Simple merge