From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Sep 2009 17:02:43 +0000 (-0700)
Subject: Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
X-Git-Tag: v2.6.32-rc1~166
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fe61c99a1227aeb5a4324e39cecf465a4b2052d3;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'fix/asoc' of git://git./linux/kernel/git/tiwai/sound-2.6

* 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ASoC: wm8753: fix mapping when MONOMIX is set to Stereo
  ASoC: some minor changes for AD1836 and AD1938 codec drivers
  ASoC: DaVinci: Fixes to McASP configuration
  ASoC: Blackfin I2S: fix resuming when device hasn't been used
  ASoC: Blackfin I2S: add lost platform_device parameter to resume function
  ASoC: fix typos in Blackfin headers
  ASoC: bf5xx-sport: the irq save/restore funcs take an unsigned long
  ASoC: Blackfin AC97: add a few missing multichannel define handling
---

fe61c99a1227aeb5a4324e39cecf465a4b2052d3