Received: by mail.netbsd.org (Postfix, from userid 605) id 47A4985F0B; Sat, 6 Aug 2016 10:45:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C869C85F07 for ; Sat, 6 Aug 2016 10:45:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id g8RH9ksIGTWS for ; Sat, 6 Aug 2016 10:45:22 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7587D85EBE for ; Sat, 6 Aug 2016 10:45:22 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6BA62FBB5; Sat, 6 Aug 2016 10:45:22 +0000 (UTC) Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" MIME-Version: 1.0 Date: Sat, 6 Aug 2016 10:45:22 +0000 From: "Paul Goyette" Subject: CVS commit: [pgoyette-localcount] src/sys/arch/x86/x86 To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20160806104522.6BA62FBB5@cvs.NetBSD.org> Sender: source-changes-owner@NetBSD.org List-Id: source-changes.NetBSD.org Precedence: bulk Reply-To: source-changes-d@NetBSD.org Mail-Reply-To: "Paul Goyette" Mail-Followup-To: source-changes-d@NetBSD.org Module Name: src Committed By: pgoyette Date: Sat Aug 6 10:45:22 UTC 2016 Modified Files: src/sys/arch/x86/x86 [pgoyette-localcount]: pmap.c Log Message: Resolve $NetBSD$ conflict To generate a diff of this commit: cvs rdiff -u -r1.211.2.2 -r1.211.2.3 src/sys/arch/x86/x86/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.