Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Tue, 21 Apr 2009 05:42:49 +0000 (07:42 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 21 Apr 2009 05:42:49 +0000 (07:42 +0200)
* fix/asoc:
  ASoC: Fix warning in wm9705
  ASoC: OMAP: Update contact addresses
  ASoC: pxa-ssp: Don't use SSCR0_SerClkDiv and SSCR0_SCR

1  2 
sound/soc/omap/omap-pcm.c
sound/soc/pxa/pxa-ssp.c

Simple merge
Simple merge