Merge branch 'x86/asm' into x86/urgent
[safe/jmp/linux-2.6] / include / pcmcia / mem_op.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2