Merge commit 'v2.6.28' into core/core
[linux-2.6] / drivers / pcmcia / cirrus.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2