]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d71f5be 986b2f2)
Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jan 2012 20:53:36 +0000 (12:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jan 2012 20:53:36 +0000 (12:53 -0800)
* 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ASoC: Wait for WM8993 FLL to stabilise
  ASoC: core - Free platform DAPM context at platform removal.
  ASoC: dapm - Fix check for codec context in dapm_power_widgets().
  ASoC: sgtl5000: update author email address
  ASoC: Fix DMA channel leak in imx-pcm-dma-mx2 driver.

1  2 
sound/soc/codecs/sgtl5000.c patch | diff1 | diff2 | blob | history
sound/soc/imx/imx-pcm-dma-mx2.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/codecs/sgtl5000.c
Simple merge
diff --cc sound/soc/imx/imx-pcm-dma-mx2.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.