From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wolfgang Denk Date: Fri, 29 May 2009 10:29:59 +0200 Subject: [U-Boot] Please pull u-boot-ppc4xx/next In-Reply-To: <20090528193618.c1cbf749.kim.phillips@freescale.com> References: <200905281322.57837.sr@denx.de> <20090528193600.92164832E416@gemini.denx.de> <20090528193618.c1cbf749.kim.phillips@freescale.com> Message-ID: <20090529082959.29192832E416@gemini.denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Dear Kim Phillips, In message <20090528193618.c1cbf749.kim.phillips@freescale.com> you wrote: > > > Umm... actually I get this: > > > > From git://www.denx.de/git/u-boot-ppc4xx > > * branch next -> FETCH_HEAD > > Updating cab6c2a..ee4b37b > > Fast forward > > common/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(-) > > > > > > 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 -- 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 <8cvi5t4c3t.fsf@gadget.cscaper.com>