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)
commitf22d806b6cc0c74dd0a1a21b3f311dba51d9df84
treedcc11baa299cb60a8aa06e909ab1ef847ec2a85f
parent9bc5df222b9cfc4be1176e566dfba2ab5c6b43f8
parent516ef69f160fb2f092d71f2cb635a9394ff8a71a
Merge branch 'fix/asoc' into for-linus

* fix/asoc:
  ASoC: Fix warning in wm9705
  ASoC: OMAP: Update contact addresses
  ASoC: pxa-ssp: Don't use SSCR0_SerClkDiv and SSCR0_SCR
sound/soc/omap/omap-pcm.c
sound/soc/pxa/pxa-ssp.c