[U-Boot] Pull request u-boot-marvell.git

Prafulla Wadaskar prafulla at marvell.com
Fri Aug 5 03:52:09 CEST 2011



> -----Original Message-----
> From: Albert ARIBAUD [mailto:albert.u.boot at aribaud.net]
> Sent: Thursday, August 04, 2011 8:16 PM
> To: Prafulla Wadaskar
> Cc: 'u-boot at lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik
> Subject: Re: Pull request u-boot-marvell.git
> 
> On 04/08/2011 14:51, Prafulla Wadaskar wrote:
> > Hi Albert
> >
> > Please kindly pull
> >
> > The following changes since commit
> a3df225cd92034b03b276391a45efc516716a31a:
> >    Thomas Abraham (1):
> >          SMDKV310: Enable device tree support
> >
> > are available in the git repository at:
> >
> >    u-boot-marvell.git master branch.
> >
> > Ajay Bhargav (2):
> >        Armada100: MFP macro naming correction
> >        Armada100: Add Board Support for Marvell GuruPlug-Display
> >
> > Jason Cooper (1):
> >        drivers/rtc: add Marvell Integrated RTC
> 
> Applied tu u-boot-arm/master, thanks!
> 
> Note however that your pull req was based on a bad u-boot-arm/master,
> which I had to change as it integrated two unwanted patches.
> 
> I thus took 523bac01981c761c2536ae44b66658581914de7a (the commit of
> yours that you merged the wrong u-boot-arm/master with), merged it mith
> my corrected u-boot-arm/master, and then cherry-picking the three
> commits above into u-boot-arm/master.
> 
> You will have to force-reset your own master (and next, and possibly
> other) branch(es) onto the current u-boot-arm/master.

Hi Albert,
Thanks, I will do it at my end.

Regards..
Prafulla . .

> 
> Amicalement,
> --
> Albert.


More information about the U-Boot mailing list