diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-07-07 20:18:46 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-07-07 20:18:46 +0200 |
| commit | 3f405b46a91c0c4cdfa6077b4e1853f35a94e8ef (patch) | |
| tree | 46d8032c9f224d28f258c44727a7165c9ba47c85 /sound/soc/davinci/davinci-pcm.c | |
| parent | Merge branch 'for-2.6.31' into for-2.6.32 (diff) | |
| parent | ASoC: Minor fixes to DaVinci I2S probe function (diff) | |
| download | linux-3f405b46a91c0c4cdfa6077b4e1853f35a94e8ef.tar.xz linux-3f405b46a91c0c4cdfa6077b4e1853f35a94e8ef.zip | |
Merge branch 'davinci' into for-2.6.32
Conflicts:
sound/soc/davinci/davinci-i2s.c
Diffstat (limited to 'sound/soc/davinci/davinci-pcm.c')
0 files changed, 0 insertions, 0 deletions