Merge branches 'release', 'ejd', 'sony' and 'wmi' into release
[linux-2.6] / drivers / pcmcia / sa11xx_base.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2