[U-Boot] Please pull u-boot-avr32/master

[Wolfgang Denk]

Dear Andreas Bießmann,

In message <1346708952-13572-1-git-send-email-andreas.devel at googlemail.com> you wrote:
> 
> I'm a bit puzzled about the latest discussion regarding merge vs. rebase. I'm
> afraid of creating merge commits so this is a first pull request for you to
> get these changes into u-boot/master.

I have to admit that merge commits are still a puzzle to me.
Something must have changed in recent git versions, as I now actually
have to edit the commit message for these.


> There are at least two more patches for this release. Namely the dlmalloc
> thing I'm still working on and a new avr32 board which requires some changes
> comming through u-boot-arm (d22f072f5dbfa21a3d5b2cf004bce3906ab62979).
> 
> The following changes since commit 27e301e5b7df6254c768d27130d3a36c31d55c96:
> 
>   CREDITS: Add credits for MCF5249 initialization code (2012-09-01 14:50:09 +0200)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-avr32.git master
> 
> for you to fetch changes up to 6ed0e940713d417f24fbc67898cea6f6ece4a0e1:
> 
>   net:macb: add line break (2012-09-03 23:39:11 +0200)
> 
> ----------------------------------------------------------------
> Andreas Bießmann (2):
>       avr32:portmux: fix setup for macb1
>       net:macb: add line break
> 
> Benoît Thébaudeau (1):
>       avr32: Remove redundant LDSCRIPT definition
> 
>  arch/avr32/config.mk                |    2 --
>  arch/avr32/cpu/at32ap700x/portmux.c |    2 +-
>  drivers/net/macb.c                  |    2 +-
>  3 files changed, 2 insertions(+), 4 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Q:  How do you tell if you're making  love  to  a  nurse,  a  school-
    teacher, or an airline stewardess?
A:  A nurse says: "This won't hurt  a  bit."  A  schoolteacher  says:
    "We're  going to have to do this over and over again until we get
    it right." An airline stewardess says: "Just hold this over  your
    mouth and nose, and breath normally."