Merge branch 'sony' into release
[linux-2.6-microblaze.git] / drivers / pcmcia / sa11xx_base.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2