| commit | 047ec4b5de745fa1e0b56afcb06d431046bd36a3 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 09 09:13:10 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 09 09:13:10 2011 -0700 |
| tree | 4da0893fd269b5016217f692a09b41f85feb2704 | |
| parent | fd98a5d78062289552fff19afb9aa6918eaee63f [diff] | |
| parent | 69b91bc1551a2fc746a01fea9d3291e60be3780d [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: Fix CODEC DAI names for Goni ASoC: Fix CODEC name in Goni davinci-mcasp: fix _CBM_CFS pin directions davinci-mcasp: fix _CBM_CFS hw_params davinci-mcasp: use bitfield definitions for PDIR ASoC: davinci-mcasp: correct tdm_slots limit