From: Takashi Iwai Date: Tue, 21 Apr 2009 05:42:49 +0000 (+0200) Subject: Merge branch 'fix/asoc' into for-linus X-Git-Tag: v2.6.30-rc4~61^2~4 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f22d806b6cc0c74dd0a1a21b3f311dba51d9df84;p=~emulex%2Finfiniband.git 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 --- f22d806b6cc0c74dd0a1a21b3f311dba51d9df84