diff --git a/[refs] b/[refs] index 1989ef25f863..65a017b661ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0300e7f1a525ae4e4ac05344624adf0e5f13ea52 +refs/heads/master: b48ccb095a0c9257241261ec2bd1cbb1bdabc48b diff --git a/trunk/kernel/panic.c b/trunk/kernel/panic.c index 934fb377f4b3..3dcaa1661357 100644 --- a/trunk/kernel/panic.c +++ b/trunk/kernel/panic.c @@ -221,7 +221,7 @@ void add_taint(unsigned flag) * post-warning case. */ if (flag != TAINT_CRAP && flag != TAINT_WARN && __debug_locks_off()) - printk(KERN_WARNING "Disabling lockdep due to kernel taint\n"); + printk(KERN_WARNING "Disabling lock debugging due to kernel taint\n"); set_bit(flag, &tainted_mask); }