tree a1d78a51725dbcf2d8ffb38873c0825f48944015
parent ff54250a0ebab7f90a5f848a0ba63f999830c872
parent 002fbad829883a3ad9b185077f9e54c37dc7502d
author Takashi Iwai <tiwai@suse.de> 1240133978 +0200
committer Takashi Iwai <tiwai@suse.de> 1240133978 +0200

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