Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
[linux-2.6] / arch / alpha / kernel / sys_sx164.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2