From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Roese Date: Tue, 22 Dec 2009 05:51:50 +0100 Subject: [U-Boot] Please pull u-boot-ppc4xx In-Reply-To: <20091221200631.94DF43F6EF@gemini.denx.de> References: <200912211033.15987.sr@denx.de> <20091221200631.94DF43F6EF@gemini.denx.de> Message-ID: <200912220551.50227.sr@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 Hi Wolfgang, On Monday 21 December 2009 21:06:31 Wolfgang Denk wrote: > Umm.. you seem to have a strange commit in your repository. When > pulling, I see this: > > Merge made by recursive. > board/sandburst/common/ppc440gx_i2c.c | 73 > +++++++++++++++++---------------- > board/sandburst/common/ppc440gx_i2c.h | > 30 +++++++------- > include/asm-mips/unaligned.h | 26 ++++++++++++ > include/configs/alpr.h | 2 - > 4 files changed, 79 insertions(+), 52 deletions(-) > create mode 100644 include/asm-mips/unaligned.h > > Seems you have a MIPS commit in your tree: > > commit 223e97641cd60abed95dc7a6dd15d8fdf0951ff9 > Author: Shinya Kuribayashi > Date: Fri Dec 18 19:32:13 2009 +0900 > > MIPS: qemu_mips: Fix a build failure caused by missing > > > > This does not seem right to me. > > NOT pulled. Ups. Sorry. My fault. I'll fix this and send another pull request today. Thanks for checking. Cheers, 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