quitte@quitte-PC:/mnt/quitte/uboot-round3/u-boot-sunxi$ git status
On branch sunxi-current
Your branch is ahead of 'origin/sunxi-current' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 5fe3e8c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

        new file:   drivers/mtd/nand/nand_spl_mtd.c
        modified:   include/.gitignore

Unmerged paths:
  (use "git add <file>..." to mark resolution)

        both modified:      .gitignore
        both modified:      arch/arm/cpu/armv7/sunxi/board.c
        both added:         arch/arm/include/asm/arch-sunxi/dma.h
        both added:         arch/arm/include/asm/arch-sunxi/dma_i.h
        both modified:      board/sunxi/Makefile
        both modified:      boards.cfg
        both modified:      drivers/dma/Makefile
        both added:         drivers/dma/sunxi_dma.c
        both modified:      drivers/mtd/nand/Makefile
        both modified:      drivers/mtd/nand/sunxi_nand.c
        both modified:      include/configs/sunxi-common.h
        both modified:      tools/mksunxiboot.c

quitte@quitte-PC:/mnt/quitte/uboot-round3/u-boot-sunxi$