Merge by hand (conflicts between pending drivers and kfree cleanups)
[powerpc.git] / arch / sparc64 / oprofile / init.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2