From: Takashi Iwai Date: Sun, 19 Apr 2009 09:39:38 +0000 (+0200) Subject: Merge branch 'fix/asoc' into for-linus X-Git-Tag: v2.6.30-rc3~46^2~3 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1e2ae4ddd373af6fa3ea2483d7fc4a08c7f54395;p=linux.git Merge branch 'fix/asoc' into for-linus * fix/asoc: ASoC: OMAP: Fix FS polarity in OSK5912 machine driver ASoC: OMAP: Fix DSP_B format in OMAP McBSP DAI driver ASoC: Fix include build error in s3c2412-i2s.c ASoC: Fix s3c-i2s-v2.c snd_soc_dai changes ASoC: s3c-i2s-v2.c fix for s3c_i2sv2_iis_calc_rate ASoC: Fix jive_wm8750.c build problems ASoC: pxa-ssp: allow setting of dai format 0 --- 1e2ae4ddd373af6fa3ea2483d7fc4a08c7f54395