Merge branch 'linus' into perf/core, to fix conflicts
[linux-2.6-microblaze.git] / arch / .gitignore
1 i386
2 x86_64