Merge branch 'master' of /usr/src/linux-2.6
[linux-2.6] / arch / ia64 / kernel / cyclone.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2