[GFS2] Fix up merge of Linus' kernel into GFS2
[safe/jmp/linux-2.6] / include / asm-m68k / pci.h
2005-07-12 David Shaohua Li[ACPI] PNPACPI vs sound IRQ
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2