Merge branch 'linus' into core/urgent
[linux-2.6] / arch / alpha / lib / srm_printk.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2