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/mga_bufs.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/mga_bufs.c')
-rw-r--r-- | linux/mga_bufs.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/linux/mga_bufs.c b/linux/mga_bufs.c index 3ce428b2..b97eb495 100644 --- a/linux/mga_bufs.c +++ b/linux/mga_bufs.c @@ -2,6 +2,7 @@ * Created: Thu Jan 6 01:47:26 2000 by jhartmann@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 @@ -23,10 +24,8 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * Authors: Rickard E. (Rik) Faith <faith@precisioninsight.com> - * Jeff Hartmann <jhartmann@precisioninsight.com> - * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_bufs.c,v 1.1 2000/02/11 17:26:06 dawes Exp $ + * Authors: Rickard E. (Rik) Faith <faith@valinux.com> + * Jeff Hartmann <jhartmann@valinux.com> * */ |