Merge branch 'linux-2.6' into merge
[cascardo/linux.git] / include / asm-um / local.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2