Merge commit 'v2.6.26' into core/locking
[linux-2.6] / arch / alpha / kernel / io.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2