Merge branch 'u-boot-marvell/master' into 'u-boot-arm/master'
[platform/kernel/u-boot.git] / arch / .gitignore
1 /*/include/asm/arch
2 /*/include/asm/proc