Please pull u-boot-ppc4xx/next
Hi Wolfgang,
please pull this change for 4xx/next:
The following changes since commit 034a9fcdccd5439a2dee8039a0b2a1f47519ef38:
Stefan Roese (1):
Merge branch 'next' of /home/stefan/git/u-boot/u-boot into next
are available in the git repository at:
git://www.denx.de/git/u-boot-ppc4xx.git next
Stefan Roese (1):
ppc4xx: Remove PCI async bootup message if PCI is not used
cpu/ppc4xx/cpu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Dear Stefan Roese,
Quoted 10 lines · In message <[email protected]> you wrote:
Hi Wolfgang,
please pull this change for 4xx/next:
The following changes since commit
034a9fcdccd5439a2dee8039a0b2a1f47519ef38:
Stefan Roese (1):
Merge branch 'next' of/home/stefan/git/u-boot/u-bootinto nextare available in the git repository at:
Quoted 8 lines
git://www.denx.de/git/u-boot-ppc4xx.gitnextStefan Roese (1):
ppc4xx: Remove PCI async bootup message if PCI is not usedcpu/ppc4xx/cpu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Umm... actually I get this:
Quoted 14 lines · On Thu, 28 May 2009 21:36:00 +0200 Wolfgang Denk <[email protected]> wrote:
Umm... actually I get this:
From
git://www.denx.de/git/u-boot-ppc4xx
* branch next ->FETCH_HEAD
Updating cab6c2a..ee4b37b
Fast forwardcommon/cmd_ide.c | 4 ++-- common/cmd_ubi.c | 2 +- cpu/blackfin/interrupts.c | 5 +++-- cpu/ppc4xx/cpu.c | 2 +- include/configs/TQM834x.h | 20 -------------------- 5 files changed, 7 insertions(+), 26 deletions(-)
Quoted 1 line
This is not right, it seems. Can you please check your repo?
It looks like Stefan pulled your master branch into his next branch before you did.
Kim
Quoted 17 lines · On Friday 29 May 2009 02:36:18 Kim Phillips wrote:
On Thu, 28 May 2009 21:36:00 +0200
Quoted 14 lines · Wolfgang Denk
Umm... actually I get this:
From
git://www.denx.de/git/u-boot-ppc4xx
* branch next ->FETCH_HEAD
Updating cab6c2a..ee4b37b
Fast forwardcommon/cmd_ide.c | 4 ++-- common/cmd_ubi.c | 2 +- cpu/blackfin/interrupts.c | 5 +++-- cpu/ppc4xx/cpu.c | 2 +- include/configs/TQM834x.h | 20 -------------------- 5 files changed, 7 insertions(+), 26 deletions(-)
Quoted 4 lines
Quoted 1 line
This is not right, it seems. Can you please check your repo?
It looks like Stefan pulled your master branch into his next branch before you did.
Ups, might be I screwed up. Sorry about this. I'll check and fix it.
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================
Dear Kim Phillips,
Quoted 15 lines · In message <[email protected]> you wrote:
Quoted 15 lines
Umm... actually I get this:
From
git://www.denx.de/git/u-boot-ppc4xx
* branch next ->FETCH_HEAD
Updating cab6c2a..ee4b37b
Fast forwardcommon/cmd_ide.c | 4 ++-- common/cmd_ubi.c | 2 +- cpu/blackfin/interrupts.c | 5 +++-- cpu/ppc4xx/cpu.c | 2 +- include/configs/TQM834x.h | 20 -------------------- 5 files changed, 7 insertions(+), 26 deletions(-)
Quoted 4 lines
Quoted 1 line
This is not right, it seems. Can you please check your repo?
It looks like Stefan pulled your master branch into his next branch before you did.
That's my suspicion, too. But he is not supposed to do that :-)
Best regards,
Wolfgang Denk
Signature · 6 lines
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
Name one thing windows is better than unix in?
Making money for Microsoft?
-- Randal L. Schwartz in <[email protected]>