Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Remove pr_<level> uses of KERN_<level>
  therm_throt.c: Trivial printk message fix for a unsuitable abbreviation of 'thermal'
  x86: Use {push,pop}{l,q}_cfi in more places
  i386: Add unwind directives to syscall ptregs stubs
  x86-64: Use symbolics instead of raw numbers in entry_64.S
  x86-64: Adjust frame type at paranoid_exit:
  x86-64: Fix unwind annotations in syscall stubs

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c
index 08f75fb4f509..6fe2b5cb4f3c 100644
--- a/arch/x86/kernel/apb_timer.c
+++ b/arch/x86/kernel/apb_timer.c
@@ -398,7 +398,7 @@ static int apbt_cpuhp_notify(struct notifier_block *n,
                 }
                 break;
         default:
-                pr_debug(KERN_INFO "APBT notified %lu, no action\n", action);
+                pr_debug("APBT notified %lu, no action\n", action);
         }
         return NOTIFY_OK;
 }
@@ -552,7 +552,7 @@ bad_count:
                 pr_debug("APB CS going back %lx:%lx:%lx ",
                          t2, last_read, t2 - last_read);
 bad_count_x3:
-                pr_debug(KERN_INFO "tripple check enforced\n");
+                pr_debug("triple check enforced\n");
                 t0 = apbt_readl(phy_cs_timer_id,
                                 APBTMR_N_CURRENT_VALUE);
                 udelay(1);