diff options
| author | Daryll Strauss <daryll@users.sourceforge.net> | 2000-06-09 02:29:41 +0000 |
|---|---|---|
| committer | Daryll Strauss <daryll@users.sourceforge.net> | 2000-06-09 02:29:41 +0000 |
| commit | 5d122e6a09d0b956cab6c351f282373140dfbfee (patch) | |
| tree | 04832c5c1faa38c7d4ddd2f33431f0c1c2cd2b35 /linux/lock.c | |
| parent | fc6568f03bfbb49a7447010061d8daf68563571a (diff) | |
Merge the latest version of the trunk into my tdfx-2-0 branch.tdfx-2-0-20000608-mergetdfx-2-0-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> * */ |