Merge commit 'jk/jk-merge'
[linux-2.6] / arch / sparc64 / oprofile / init.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2