[src/trunk]: src/usr.sbin/cpuctl/arch don't call most/all Core2's "(Merom)".

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f9b36ab76470
branches:  trunk
changeset: 752120:f9b36ab76470
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Feb 16 00:13:14 2010 +0000

description:
don't call most/all Core2's "(Merom)".

diffstat:

 usr.sbin/cpuctl/arch/i386.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 989e57bede8c -r f9b36ab76470 usr.sbin/cpuctl/arch/i386.c
--- a/usr.sbin/cpuctl/arch/i386.c       Tue Feb 16 00:03:47 2010 +0000
+++ b/usr.sbin/cpuctl/arch/i386.c       Tue Feb 16 00:13:14 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i386.c,v 1.20 2009/10/02 13:54:01 jmcneill Exp $       */
+/*     $NetBSD: i386.c,v 1.21 2010/02/16 00:13:14 mrg Exp $    */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.20 2009/10/02 13:54:01 jmcneill Exp $");
+__RCSID("$NetBSD: i386.c,v 1.21 2010/02/16 00:13:14 mrg Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -309,7 +309,7 @@
                                "Pentium III (Tualatin)", 0,
                                "Pentium M (Dothan)", 
                                "Pentium M (Yonah)",
-                               "Core 2 (Merom)",
+                               "Core 2",
                                "Pentium Pro, II or III"        /* Default */
                        },
                        NULL,