Merge 'acpi-2.6.12' branch into to-akpm
[linux-2.6] / include / pcmcia / cisreg.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2