[U-Boot] [PULL] u-boot-atmel/master -> u-boot/master

[Tom Rini]

On Mon, Nov 17, 2014 at 01:35:20PM +0100, Andreas Bießmann wrote:

> Hi Tom,
> 
> please pull u-boot-atmel/master into u-boot/master.
> 
> Sorry for the huge patch-list. I accidentally pulled in u-boot-arm/master
> someday and pushed it. Unfortunately the pushed tree couldn't be deleted for
> good reasons. I'm so sorry for the mess.
> 
> The following changes since commit 2086e388d56cbb0e3737a6276f04f00f74bf6723:
> 
>   Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx (2014-11-14 16:39:32 -0500)
> 
> are available in the git repository at:
> 
> 
>   git://git.denx.de/u-boot-atmel.git master

OK, this is a mess and just git pulling made things messier still.  I
took your branch into a new branch locally, rebased and now have:

f196044 ARM: atmel: add sama5d4 xplained ultra board support
927b901 ARM: atmel: add sama5d4ek board support
cabf61c net: macb: enable GMAC IP without GE feature support
7df4486 mtd: atmel_nand: runtime to build gf table for pmecc
5b15fd9 arm, spl, at91: add spl support for the corvus board
237e3793 arm, at91, spl: add spl support for the taurus board
5abc00d arm, spl, at91: add at91sam9260 and at91sam9g45 spl support
667af36 spl, mtd, nand, atmel_nand: invert device ready pin logic
4dfd360 spl, nand, atmel_nand: add erase one block function
c1ec406 mtd: atmel_nand: add missing include
0c3117b spl, nand: add option to boot raw u-boot.bin image only
bd1bb3c arm, at91: add missing ddr2 cr register MPDDRC_CR_EBISHARE define
7dd5891 arm, at91: compile mpddrc ram init code also for AT91SAM9M10G45
341f548 arm, at91, mpddrc: fix typo in ddr2_init()
50921cd arm, at91: add spi dataflash support for the taurus board
f11dea4 spi, atmel: move CONFIG_SYS_SPI_WRITE_TOUT into common header
c001486 arm, at91: generate boot.bin file for all atmel SoC
da79fa4 ARM: atmel: spl: make css field configurable
a5f35d6 ARM: atmel: spl: make initialization more stable
59158ba ARM: at91 series: convert to generic board
b2eff08 net: macb: write mac address when initialization

As what I've taken into master and build tested and pushed.  I think
you'll just need to git reset --hard and git push -f your tree to get it
back to a happy state.  Thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141117/70e53868/attachment.pgp>