From: Mike Frysinger Date: Mon, 6 Apr 2009 17:48:14 -0400 Subject: [U-Boot] [PATCH] Macronix MX25xx MTD SPI flash driver In-Reply-To: <20090406181523.96E9E832E416@gemini.denx.de> References: <1239033283-26144-1-git-send-email-prafulla@marvell.com> <200904060711.50104.vapier@gentoo.org> <20090406181523.96E9E832E416@gemini.denx.de> Message-ID: <200904061748.15667.vapier@gentoo.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Monday 06 April 2009 14:15:23 Wolfgang Denk wrote: > In message Mike Frysinger wrote: > > since these are trivial and i'm in a good mood, i'll go ahead and fix up > > the conflicts and add them to my sf branch. but in the future please > > make sure to integrate these methodologies. > > Please don't or undo. The Signed-off-by: entry is not OK either, and > we cannot change this. how so ? Prafulla: could you resubmit then ? the cleaned up patch i merged is here: http://git.denx.de/?p=u-boot/u-boot- blackfin.git;a=commitdiff;h=eddc6059da8dd71cbe84522b281b15b26dd927c7 the things i fixed: - your name - duplicate tags - patch changelog in commit - missing change to spi_flash_internal.h - fixed Makefile conflicts - cmd[0] vs cmd error -mike -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: This is a digitally signed message part. Url : http://lists.denx.de/pipermail/u-boot/attachments/20090406/30b5ae08/attachment.pgp