diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-07-07 19:18:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-07-07 19:18:46 +0100 |
| commit | 3f405b46a91c0c4cdfa6077b4e1853f35a94e8ef (patch) | |
| tree | 46d8032c9f224d28f258c44727a7165c9ba47c85 /sound/sound_core.c | |
| parent | 4ec5c9693b46ab34976511cd43bf75c3a0fc704d (diff) | |
| parent | efd13be09e2db4ac4efa2c6101c4f50ee1ead4b0 (diff) | |
Merge branch 'davinci' into for-2.6.32
Conflicts:
sound/soc/davinci/davinci-i2s.c
Diffstat (limited to 'sound/sound_core.c')
0 files changed, 0 insertions, 0 deletions