linux-next: manual merge of the arm-soc tree with the usb tree

Sebastian Andrzej Siewior bigeasy at linutronix.de
Tue Aug 27 10:02:51 EDT 2013


On 08/27/2013 03:57 PM, Benoit Cousson wrote:
> + Kevin,
> 
> On 27/08/2013 15:53, Sebastian Andrzej Siewior wrote:
>> What do we do now?
> 
> Cannot you just merge the stable arm-soc/dt branch into your branch
> before applying your patches?

That is up to Greg. This changes sat in his usb-next tree for a while
now. And before they hit Greg they were in Felipe's tree for a while.

To be exact, last .dts change via USB was:

Author:     Sebastian Andrzej Siewior <bigeasy at linutronix.de>
AuthorDate: Thu Jun 20 12:13:04 2013 +0200
Commit:     Felipe Balbi <balbi at ti.com>
CommitDate: Fri Aug 9 17:40:16 2013 +0300

	usb: musb dma: add cppi41 dma driver

> Regards
> Benoit

Sebastian



More information about the linux-arm-kernel mailing list