Merge branch 'for-linus' of git://www.jni.nu/cris
[sfrench/cifs-2.6.git] / drivers / net / pcmcia / ositech.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2