git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linux
[pandora-kernel.git]
/
kernel
/
taskstats.c
diff --git
a/kernel/taskstats.c
b/kernel/taskstats.c
index
3971c6b
..
9ffea36
100644
(file)
--- a/
kernel/taskstats.c
+++ b/
kernel/taskstats.c
@@
-685,7
+685,7
@@
static int __init taskstats_init(void)
goto err_cgroup_ops;
family_registered = 1;
goto err_cgroup_ops;
family_registered = 1;
- pr
intk
("registered taskstats version %d\n", TASKSTATS_GENL_VERSION);
+ pr
_info
("registered taskstats version %d\n", TASKSTATS_GENL_VERSION);
return 0;
err_cgroup_ops:
genl_unregister_ops(&family, &taskstats_ops);
return 0;
err_cgroup_ops:
genl_unregister_ops(&family, &taskstats_ops);