Dear Stefano Babic, In message <4b87bc50.8000...@denx.de> you wrote: > > The patch was sent some times ago, based on the u-boot master branch at > the time it was sent. Of course, other boards went to the mainline in > the meantime, patching the MAINTAINERS file again - you have probably to > merge this file.
There are no merge conflicts. git will happily apply your patch as is; I just verified this again. I used 'git-am' though, of course. 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: w...@denx.de I mean, I . . . think to understand you, I just don't know what you are saying ... - Terry Pratchett, _Soul Music_ _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
