From 5bd8014f276d447178a1193d9dea1b976647d6ce Mon Sep 17 00:00:00 2001 From: Jeff Hartmann Date: Thu, 16 Mar 2000 03:37:30 +0000 Subject: Merge with 4.0 --- linux/gamma_drv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'linux/gamma_drv.c') diff --git a/linux/gamma_drv.c b/linux/gamma_drv.c index 4e1e30e1..ce970835 100644 --- a/linux/gamma_drv.c +++ b/linux/gamma_drv.c @@ -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/gamma_drv.c,v 1.17 1999/08/30 13:05:00 faith Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.c,v 1.3 2000/01/20 07:25:35 martin Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.c,v 1.4 2000/02/23 04:47:28 martin Exp $ * */ -- cgit v1.2.3