Received: by mail.netbsd.org (Postfix, from userid 605) id 6487014A145; Wed, 7 Dec 2011 13:24:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E958A14A149 for ; Wed, 7 Dec 2011 13:24:05 +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 oM2D2Omp_f6L for ; Wed, 7 Dec 2011 13:24:05 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id 2A61114A145 for ; Wed, 7 Dec 2011 13:24:05 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id 077CC175DD; Wed, 7 Dec 2011 13:24:05 +0000 (UTC) MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Date: Wed, 7 Dec 2011 13:24:04 +0000 From: "Christoph Egger" Subject: CVS commit: src/sys/arch/xen/include/xen-public To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20111207132405.077CC175DD@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: "Christoph Egger" Mail-Followup-To: source-changes-d@NetBSD.org Module Name: src Committed By: cegger Date: Wed Dec 7 13:24:04 UTC 2011 Added Files: src/sys/arch/xen/include/xen-public: arch-x86_32.h arch-x86_64.h dom0_ops.h event_channel.h grant_table.h physdev.h trace.h xen.h src/sys/arch/xen/include/xen-public/io: blkif.h netif.h Log Message: merge. The 'conflicts' happened because xen-public was once used for xen2 headers. To generate a diff of this commit: cvs rdiff -u -r0 -r1.5 src/sys/arch/xen/include/xen-public/arch-x86_32.h \ src/sys/arch/xen/include/xen-public/arch-x86_64.h \ src/sys/arch/xen/include/xen-public/dom0_ops.h \ src/sys/arch/xen/include/xen-public/event_channel.h \ src/sys/arch/xen/include/xen-public/grant_table.h \ src/sys/arch/xen/include/xen-public/physdev.h \ src/sys/arch/xen/include/xen-public/trace.h cvs rdiff -u -r0 -r1.10 src/sys/arch/xen/include/xen-public/xen.h cvs rdiff -u -r0 -r1.5 src/sys/arch/xen/include/xen-public/io/blkif.h \ src/sys/arch/xen/include/xen-public/io/netif.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.