merge 2.6.13-rc4 with ACPI's to-linus tree
[sfrench/cifs-2.6.git] / drivers / pcmcia / sa1100_cerf.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2