Merge branch 'topic/asoc' into for-linus
Takashi Iwai [Mon, 6 Apr 2009 01:47:20 +0000 (03:47 +0200)]
1  2 
sound/arm/pxa2xx-ac97-lib.c
sound/soc/pxa/pxa-ssp.c

Simple merge
Simple merge