tree dcc11baa299cb60a8aa06e909ab1ef847ec2a85f
parent 9bc5df222b9cfc4be1176e566dfba2ab5c6b43f8
parent 516ef69f160fb2f092d71f2cb635a9394ff8a71a
author Takashi Iwai <tiwai@suse.de> 1240292569 +0200
committer Takashi Iwai <tiwai@suse.de> 1240292569 +0200

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