Merge branch 'x86/apic' into x86/core
[linux-2.6] / drivers / zorro / zorro.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2