tree ecb00994f0715d0cb40ca86ab0a746cbb7d2fd60
parent 56dc16f75dfe91ea91f6b0978b3871003934ae82
parent 6574612fbb34c63117581e68f2231ddce027e41e
author Takashi Iwai <tiwai@suse.de> 1241446003 +0200
committer Takashi Iwai <tiwai@suse.de> 1241446003 +0200

Merge branch 'fix/asoc' into for-linus

* fix/asoc:
  ASoC: Remove BROKEN from mpc5200 kconfig
  ASoC: TWL4030: Fix gain control for earpiece amplifier
  ASoC: Set the MPC5200 i2s driver to BROKEN status.
  ASoC: Fix logic in WM8350 master clocking check