Merge branch 'tegra' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 18 Apr 2011 17:08:22 +0000 (18:08 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 18 Apr 2011 17:08:22 +0000 (18:08 +0100)
1  2 
sound/soc/tegra/harmony.c

Simple merge