Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
[linux-2.6] / include / pcmcia / mem_op.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2