diff options
| author | Doug Rabson <dfr@freebsd.org> | 2000-06-13 15:33:21 +0000 |
|---|---|---|
| committer | Doug Rabson <dfr@freebsd.org> | 2000-06-13 15:33:21 +0000 |
| commit | c2795393281e915c53b347eba0a427d4d375a1ac (patch) | |
| tree | 52ee0302ab3420a7e95a7b751f2e69876918886b /linux/lock.c | |
| parent | 46f2275dab156b302192865bb618107ef4e9a286 (diff) | |
Merge trunk into bsd-1-0-1-branch.bsd-1-0-1-20000613bsd-1-0-1-branch
Diffstat (limited to 'linux/lock.c')
| -rw-r--r-- | linux/lock.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/lock.c b/linux/lock.c index adf27ab5..55082727 100644 --- a/linux/lock.c +++ b/linux/lock.c @@ -1,8 +1,8 @@ /* lock.c -- IOCTLs for locking -*- linux-c -*- * Created: Tue Feb 2 08:37:54 1999 by faith@precisioninsight.com - * Revised: Sun Feb 13 23:38:25 2000 by kevin@precisioninsight.com * * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -24,7 +24,8 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lock.c,v 1.5 2000/02/23 04:47:29 martin Exp $ + * Authors: + * Rickard E. (Rik) Faith <faith@valinux.com> * */ |