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)
commit04af964f9cb666caa7c1436d003f8fac0f1fedcc
treef59aeb6c00b10294217b5ea75eb87403c61c314d
parent7b306dae22ca377ea0020261ef13aea85b8f5f3f
parent2811fe2beb7cb9f34eef4bc9627dcabb401bc05e
Merge branch 'for-2.6.37' into for-2.6.38
sound/soc/codecs/max98088.c
sound/soc/codecs/uda134x.c