From 569da5a42ebf10c86d6c6ba81866a888e1c708dc Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 8 Jun 2000 14:38:22 +0000 Subject: Merged glxmisc-3-0-0 --- shared/drm.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'shared') diff --git a/shared/drm.h b/shared/drm.h index c63d0f63..c8c5581d 100644 --- a/shared/drm.h +++ b/shared/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 * * Acknowledgements: * Dec 1999, Richard Henderson , move to generic cmpxchg. -- cgit v1.2.3