From c3b4030c8cda85aac73e6296596ea3a8fd7cef1a Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Tue, 3 Apr 2012 03:18:23 +0200
Subject: [PATCH] --- yaml --- r: 299119 b: refs/heads/master c:
 5da527aafed2834852fc4fe21daeaeadf7c61af3 h: refs/heads/master i:   299117:
 f1fb35fbba2ffe3614969400ce476b3f92dc2c54   299115:
 8cecf731c0e4bb27e73a6fb21d369c272a138fb8   299111:
 74b0bafd1e39052589cd7557425c7e1501fd4db5   299103:
 60e18ed579c1ba5fd1a213ed0df30894bb9e7253 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/char/hpet.c | 4 ++--
 trunk/drivers/tty/vt/vt.c | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3bb955e1811b..e3cc60452518 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57c3686842114de3b0c00633591e9605c46fb769
+refs/heads/master: 5da527aafed2834852fc4fe21daeaeadf7c61af3
diff --git a/trunk/drivers/char/hpet.c b/trunk/drivers/char/hpet.c
index 3845ab44c330..dfd7876f127c 100644
--- a/trunk/drivers/char/hpet.c
+++ b/trunk/drivers/char/hpet.c
@@ -906,8 +906,8 @@ int hpet_alloc(struct hpet_data *hdp)
 		hpetp->hp_which, hdp->hd_phys_address,
 		hpetp->hp_ntimer > 1 ? "s" : "");
 	for (i = 0; i < hpetp->hp_ntimer; i++)
-		printk("%s %d", i > 0 ? "," : "", hdp->hd_irq[i]);
-	printk("\n");
+		printk(KERN_CONT "%s %d", i > 0 ? "," : "", hdp->hd_irq[i]);
+	printk(KERN_CONT "\n");
 
 	temp = hpetp->hp_tick_freq;
 	remainder = do_div(temp, 1000000);
diff --git a/trunk/drivers/tty/vt/vt.c b/trunk/drivers/tty/vt/vt.c
index 3bdd4b19dd06..2156188db4a6 100644
--- a/trunk/drivers/tty/vt/vt.c
+++ b/trunk/drivers/tty/vt/vt.c
@@ -2932,11 +2932,10 @@ static int __init con_init(void)
 	gotoxy(vc, vc->vc_x, vc->vc_y);
 	csi_J(vc, 0);
 	update_screen(vc);
-	pr_info("Console: %s %s %dx%d",
+	pr_info("Console: %s %s %dx%d\n",
 		vc->vc_can_do_color ? "colour" : "mono",
 		display_desc, vc->vc_cols, vc->vc_rows);
 	printable = 1;
-	printk("\n");
 
 	console_unlock();