ARM: dma-mapping: fix some CMA related mismerge
[pandora-kernel.git] / arch / .gitignore
1 i386
2 x86_64