author | Linus Torvalds <torvalds@linux-foundation.org> | |
Wed, 23 Sep 2009 17:02:43 +0000 (10:02 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Wed, 23 Sep 2009 17:02:43 +0000 (10:02 -0700) | ||
commit | fe61c99a1227aeb5a4324e39cecf465a4b2052d3 | |
tree | 897eb0eaab90488835a18197dca9640737d5623a | tree | snapshot (tar.xz tar.gz zip) |
parent | 9fd815b55f31be48dbb3dd23922587d247a4e497 | commit | diff |
parent | 877ae70763fa0b19ffbe25e7e119fc96f52fbbd3 | commit | diff |
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
* '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