Manual merge with Linus.
[linux-2.6] / arch / alpha / lib / Makefile
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2