From 5bd8014f276d447178a1193d9dea1b976647d6ce Mon Sep 17 00:00:00 2001
From: Jeff Hartmann <jhartmann@valinux.com>
Date: Thu, 16 Mar 2000 03:37:30 +0000
Subject: Merge with 4.0

---
 linux/drm.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'linux/drm.h')

diff --git a/linux/drm.h b/linux/drm.h
index 7488a315..7b8e8826 100644
--- a/linux/drm.h
+++ b/linux/drm.h
@@ -24,8 +24,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h,v 1.46 1999/08/20 20:00:53 faith Exp $
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h,v 1.4 2000/02/14 06:27:26 martin Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h,v 1.5 2000/02/23 04:47:26 martin Exp $
  *
  * Acknowledgements:
  * Dec 1999, Richard Henderson <rth@twiddle.net>, move to generic cmpxchg.
-- 
cgit v1.2.3