In message 1215866194-27782-1-git-send-email-plagnioj@jcrosoft.com you wrote:
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com
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