Merge branch 'linus' into tracing/urgent
[linux-2.6] / arch / .gitignore
1 i386
2 x86_64