40737d5623a
parent 9fd815b55f31be48dbb3dd23922587d247a4e497
parent 877ae70763fa0b19ffbe25e7e119fc96f52fbbd3
author Linus Torvalds <torvalds@linux-foundation.org> 1253725363 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253725363 -0700

Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/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
 e5�"x