From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Simek Date: Fri, 03 Aug 2012 15:31:17 +0200 Subject: [U-Boot] Pull request - microblaze In-Reply-To: <20120731200701.C0B84203B37@gemini.denx.de> References: <4E675918.60104@monstr.eu> <4E895603.40403@monstr.eu> <4E896313.1020508@monstr.eu> <20111004193845.681A418E5B42@gemini.denx.de> <4E929A07.5080405@monstr.eu> <4F71B03A.8050204@monstr.eu> <50176CA2.6000303@monstr.eu> <20120731200701.C0B84203B37@gemini.denx.de> Message-ID: <501BD2A5.4090501@monstr.eu> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Dear Wolfgang Denk, On 07/31/2012 10:07 PM, Wolfgang Denk wrote: > Dear Michal Simek, > > In message <50176CA2.6000303@monstr.eu> you wrote: >> >> Please pull these patches to your repository. There will be one simple merge conflict >> around SPI makefile which is easy to resolve. > > Maybe it's easy for you - to me it was extra effort. And I don;t even > know if I did it right. Please validate! I have looked at it and there is one additional line. Will send patch to fix it. > > Next time please fix such issues yourself, and send clean, working > pull requests. Thanks. ok. Will do it next time. Thanks, Michal -- Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/ Microblaze U-BOOT custodian