In message <[EMAIL PROTECTED]> you wrote: > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[EMAIL PROTECTED]> > --- > board/armadillo/flash.c | 2 +- > board/delta/nand.c | 2 +- > board/integratorcp/flash.c | 6 +++--- > board/mp2usb/flash.c | 2 +- > board/versatile/flash.c | 2 +- > board/zylonite/nand.c | 2 +- > common/cmd_flash.c | 4 ++-- > common/cmd_nvedit.c | 2 +- > common/cmd_onenand.c | 4 ++-- > common/env_onenand.c | 2 +- > cpu/pxa/mmc.c | 2 +- > drivers/mtd/dataflash.c | 2 +- > drivers/net/smc911x.c | 4 ++-- > drivers/usb/usbdcore.c | 2 +- > fs/jffs2/jffs2_1pass.c | 4 ++-- > net/net.c | 2 +- > 16 files changed, 22 insertions(+), 22 deletions(-)
applied, with merge conflicts. Please check if it's OK. 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: [EMAIL PROTECTED] Every revolutionary idea - in science, politics, art, or whatever - evokes three stages of reaction in a hearer: 1. It is completely impossible - don't waste my time. 2. It is possible, but it is not worth doing. 3. I said it was a good idea all along. ------------------------------------------------------------------------- Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 _______________________________________________ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
