[alsa-devel] [PATCH 01/10] ASoC: blackfin: Remove unused bf5xx-{i2s, tdm, ac97}-pcm.h

[Lars-Peter Clausen]

On 05/29/2013 09:27 PM, Mark Brown wrote:
> On Tue, May 28, 2013 at 07:22:09PM +0200, Lars-Peter Clausen wrote:
>> The structs defined in these files are completely unused, so remove both the
>> structs and the files.
> 
> This series doesn't appear to apply cleanly to my topic/blackfin or the
> merge of that and v3.10-rc3 - can you please check what's going on
> there?

Hm, where exactly are you getting conflicts? If I download the patches as
they are in the ml-archive and run git am on them on top of topic/blackfin
everything applies cleanly.

Thanks,
- Lars