[PATCH 7/8] [ARM] pxa: move ssp into common plat-pxa

Mark Brown broonie at opensource.wolfsonmicro.com
Wed Mar 17 10:32:40 EDT 2010


On Wed, Mar 17, 2010 at 10:07:12PM +0800, Eric Miao wrote:

> I tried a trivial merge of 'pxa-ssp' branch in your tree, and there's
> a conflict but it's fixable. There won't be much change to make in
> my 'ssp_cleanup' branch except for the pxa168 base support. What
> I can do is I'll try constantly merge of the asoc tree, and see if I can
> provide a conflict resolve which could be later used during upstream
> merge.

OK, I guess.  Please keep the SSP cleanup branch (including any ASoC
machine drivers) around so it can be merged both ways if needed.



More information about the linux-arm-kernel mailing list