Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release
[cascardo/linux.git] / arch / .gitignore
1 i386
2 x86_64