Merge branch 'fix/asoc' into topic/asoc
Takashi Iwai [Fri, 19 Dec 2008 14:36:58 +0000 (15:36 +0100)]
1  2 
sound/soc/omap/omap-pcm.c

Simple merge