| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | |
| Tue, 6 Oct 2009 15:01:27 +0000 (16:01 +0100) | ||
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | |
| Tue, 6 Oct 2009 15:01:27 +0000 (16:01 +0100) |
| 1 | 2 | |||
|---|---|---|---|---|
| sound/soc/davinci/davinci-pcm.c | patch | | diff1 | | diff2 | | blob | history |
| sound/soc/pxa/pxa-ssp.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc sound/soc/davinci/davinci-pcm.c
Simple merge
diff --cc sound/soc/pxa/pxa-ssp.c
Simple merge