diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2000-06-08 14:38:22 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2000-06-08 14:38:22 +0000 |
commit | 569da5a42ebf10c86d6c6ba81866a888e1c708dc (patch) | |
tree | 3ce7f6e098ef6f66114eac85106f64f32b336fa5 /shared-core/drm.h | |
parent | 5ce0f2afec70a1d062b749e1bf7150c21d35281d (diff) |
Merged glxmisc-3-0-0glxmisc-3-0-0-20000608-merge
Diffstat (limited to 'shared-core/drm.h')
-rw-r--r-- | shared-core/drm.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h index c63d0f63..c8c5581d 100644 --- a/shared-core/drm.h +++ b/shared-core/drm.h @@ -1,7 +1,8 @@ /* drm.h -- Header for Direct Rendering Manager -*- linux-c -*- * Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com * - * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. + * 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 @@ -22,8 +23,9 @@ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * 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/drm.h,v 1.5 2000/02/23 04:47:26 martin Exp $ + * + * Authors: + * Rickard E. (Rik) Faith <faith@valinux.com> * * Acknowledgements: * Dec 1999, Richard Henderson <rth@twiddle.net>, move to generic cmpxchg. |