From owner-cvs-sys  Wed Jun  5 01:22:48 1996
Return-Path: owner-cvs-sys
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id BAA27728
          for cvs-sys-outgoing; Wed, 5 Jun 1996 01:22:48 -0700 (PDT)
Received: (from jkh@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id BAA27700;
          Wed, 5 Jun 1996 01:22:37 -0700 (PDT)
Date: Wed, 5 Jun 1996 01:22:37 -0700 (PDT)
From: "Jordan K. Hubbard" <jkh>
Message-Id: <199606050822.BAA27700@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-sys
Subject: cvs commit:  src/sys/sys ipc.h
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

jkh         96/06/05 01:22:36

  Branch:      sys/sys   RELENG_2_1_0
  Modified:    sys/sys   ipc.h
  Log:
  Resurrect Joerg's 2.1 commit (it was on my list, I just skipped over it
  by mistake).  CVS is acting _very_ strangely here; claims everything in
  /sys/sys for 2.1 is in conflict, even if I remove it every time.  I'm starting
  to REALLY HATE CVS and will do no more merge work with it once the tree is
  working again.  I've had it with trying to merge things with CVS - that's it,
  I quit!  I've merged my last change into 2.1.
  
  Revision  Changes    Path
  1.5.4.4   +12 -2     src/sys/sys/ipc.h