From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 2 Jul 2009 15:48:31 +0000 (+0200)
Subject: Merge branch 'fix/asoc' into for-linus
X-Git-Tag: MMI-PSA29.97-13-9~27415^2~7
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dc8a4f3fc3c32954c9fd46cb027b959380be2d65;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'fix/asoc' into for-linus

* fix/asoc:
  ASoC: Only disable pxa2xx-i2s clocks if we enabled them
  ASoC: OMAP: fix OMAP1510 broken PCM pointer callback
  ASoC: remove BROKEN from Efika and pcm030 fabric drivers
  ASoC: Fix typo in MPC5200 PSC AC97 driver Kconfig
---

dc8a4f3fc3c32954c9fd46cb027b959380be2d65