Merge branches 'sh/serial-rework' and 'sh/oprofile'
[pandora-kernel.git] / drivers / pcmcia / tcic.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2