diff --git a/[refs] b/[refs] index 84189f945535..dd654489bab5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3dcad5ff08f65ae30832220a0e0ee2eac3502a1a +refs/heads/master: cbaa51524b3224813814607177a00c350ee35d12 diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c index fdc6b887b208..2b021b0e8507 100644 --- a/trunk/kernel/time/timekeeping.c +++ b/trunk/kernel/time/timekeeping.c @@ -605,7 +605,7 @@ static struct timespec timekeeping_suspend_time; static void __timekeeping_inject_sleeptime(struct timespec *delta) { if (!timespec_valid(delta)) { - printk(KERN_WARN "__timekeeping_inject_sleeptime: Invalid " + printk(KERN_WARNING "__timekeeping_inject_sleeptime: Invalid " "sleep delta value!\n"); return; }