From: Albert ARIBAUD <albert.u.boot@aribaud.net>
To: u-boot@lists.denx.de
Subject: [U-Boot] Pull request u-boot-marvell.git
Date: Thu, 04 Aug 2011 16:45:32 +0200 [thread overview]
Message-ID: <4E3AB08C.7050100@aribaud.net> (raw)
In-Reply-To: <F766E4F80769BD478052FB6533FA745D19FB180F1D@SC-VEXCH4.marvell.com>
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.
Amicalement,
--
Albert.
next prev parent reply other threads:[~2011-08-04 14:45 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-04 12:51 [U-Boot] Pull request u-boot-marvell.git Prafulla Wadaskar
2011-08-04 14:45 ` Albert ARIBAUD [this message]
2011-08-05 1:52 ` Prafulla Wadaskar
-- strict thread matches above, loose matches on Subject: below --
2011-09-13 13:08 Prafulla Wadaskar
2011-09-13 17:43 ` Albert ARIBAUD
2011-09-14 6:06 ` Prafulla Wadaskar
2011-09-14 6:54 ` Albert ARIBAUD
2011-08-21 7:34 Prafulla Wadaskar
2011-08-21 8:05 ` Albert ARIBAUD
2011-08-21 8:15 ` Prafulla Wadaskar
2011-08-21 10:16 ` Albert ARIBAUD
2011-08-21 13:00 ` Prafulla Wadaskar
2011-08-22 6:42 ` Albert ARIBAUD
2011-06-17 10:51 Prafulla Wadaskar
2011-06-16 11:23 Prafulla Wadaskar
2011-06-18 5:46 ` Albert ARIBAUD
2011-06-20 5:16 ` Prafulla Wadaskar
2011-06-20 11:46 ` Albert ARIBAUD
2011-05-06 13:25 Prafulla Wadaskar
2011-05-06 20:00 ` Albert ARIBAUD
2011-05-06 20:43 ` Prafulla Wadaskar
2011-05-07 7:14 ` Albert ARIBAUD
2011-05-11 11:51 ` Prafulla Wadaskar
2011-05-11 21:01 ` Albert ARIBAUD
2011-04-13 14:47 Prafulla Wadaskar
2011-04-13 19:35 ` Albert ARIBAUD
2011-02-14 6:58 Prafulla Wadaskar
2011-02-14 7:17 ` Albert ARIBAUD
2011-02-09 9:49 Prafulla Wadaskar
2011-02-09 21:01 ` Albert ARIBAUD
2011-02-10 20:40 ` Albert ARIBAUD
[not found] <F766E4F80769BD478052FB6533FA745D19F11C124E@SC-VEXCH4.marvell.com>
2010-12-13 22:45 ` Wolfgang Denk
2010-12-16 22:04 ` Wolfgang Denk
[not found] <4970A9779D0EB04A877B313171049CA7047FDE73@SC-VEXCH4.marvell.com>
2010-11-25 7:10 ` Prafulla Wadaskar
2010-11-26 20:15 ` Wolfgang Denk
2010-06-17 10:35 Prafulla Wadaskar
2010-06-17 20:27 ` Wolfgang Denk
2010-08-09 6:18 ` Prafulla Wadaskar
2010-08-09 6:51 ` Albert ARIBAUD
2010-08-09 8:13 ` Prafulla Wadaskar
2010-08-09 8:40 ` Albert ARIBAUD
2010-08-10 20:45 ` Wolfgang Denk
2010-08-10 20:56 ` Albert ARIBAUD
2010-08-10 20:39 ` Wolfgang Denk
2010-08-26 5:09 ` Prafulla Wadaskar
2010-09-07 21:25 ` Wolfgang Denk
2010-09-08 6:03 ` Prafulla Wadaskar
2010-09-08 6:17 ` Wolfgang Denk
2010-10-12 5:20 ` Prafulla Wadaskar
2010-10-12 18:07 ` Wolfgang Denk
2010-10-29 11:11 ` Prafulla Wadaskar
2010-10-29 11:23 ` Albert ARIBAUD
2010-10-29 11:28 ` Prafulla Wadaskar
2010-10-29 11:45 ` Wolfgang Denk
2010-10-29 11:31 ` Stefan Roese
2010-10-29 11:39 ` Prafulla Wadaskar
2010-10-29 20:07 ` Wolfgang Denk
2010-05-21 6:46 Prafulla Wadaskar
2010-05-21 20:31 ` Wolfgang Denk
2010-05-22 6:45 ` Prafulla Wadaskar
2010-04-19 10:33 Prafulla Wadaskar
2010-04-21 23:46 ` Tom Rix
2010-04-23 13:12 ` Prafulla Wadaskar
2010-02-26 9:36 Prafulla Wadaskar
2010-02-27 23:26 ` Tom
2010-03-01 7:31 ` Heiko Schocher
2010-03-01 14:01 ` Tom
2010-01-18 4:32 Prafulla Wadaskar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E3AB08C.7050100@aribaud.net \
--to=albert.u.boot@aribaud.net \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox