Merge branch 'linus' into tracing-v28-for-linus-v3
[platform/adaptation/renesas_rcar/renesas_kernel.git] / include / pcmcia / cisreg.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2