Merge branch 'x86/s2ram-fix' into x86/urgent
[cascardo/linux.git] / arch / .gitignore
1 i386
2 x86_64