|  ec9f168fcc Conflicts:
	drivers/acpi/pci_irq.c
Note that this merge disables
 | ||
|---|---|---|
| .. | ||
| acenv.h | ||
| acgcc.h | ||
| aclinux.h | ||
|  ec9f168fcc Conflicts:
	drivers/acpi/pci_irq.c
Note that this merge disables
 | ||
|---|---|---|
| .. | ||
| acenv.h | ||
| acgcc.h | ||
| aclinux.h | ||