]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'for-2.6.29' into for-2.6.30
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 2 Feb 2009 12:46:51 +0000 (12:46 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 2 Feb 2009 12:46:51 +0000 (12:46 +0000)
1  2 
sound/soc/omap/omap-pcm.c

Simple merge