[U-Boot-Users] FW: [GIT PULL] Please pull u-boot-arm

[Guennadi Liakhovetski]

Peter, please, do NOT drop addressees from CC.

On Fri, 11 Apr 2008, Peter Pearse wrote:

> > I find I have to manually edit the mails I get from my 
> > (company mandated) mail client.
> > 
> > My process is
> > 
> > a) Save mail
> > b) Manually edit to remove extraneous/incorrect data and formatting
> > c) Run mail thru <linux kernel>/scripts/checkpatch.pl until acceptable
> > d) Run git-am, correcting the patch until applies without 
> > output other than re whitespace. 
> > 
> > On the code my patch corrections e.g. for line length might 
> > differ from those applied by someone else.

To which of the above "corrections" does this hunk belong:

diff --git a/board/mx31ads/Makefile b/board/mx31ads/Makefile
index dfadd96..c854e05 100644
--- a/board/mx31ads/Makefile
+++ b/board/mx31ads/Makefile
@@ -1,18 +1,14 @@
 #
+# (C) Copyright 2000-2008
 # Copyright (C) 2008, Guennadi Liakhovetski <lg at denx.de>
 #
+# See file CREDITS for list of people who contributed to this
+# project.
+#
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundatio; either version 2 of
-# published by the Free Software Foundation; either version 2 of

Especially the last line?

Thanks
Guennadi
---
Guennadi Liakhovetski