Merge branches 'release' and 'menlo' into release
[linux-2.6] / drivers / pcmcia / sa1111_generic.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2