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/Makefile.linux | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'linux/Makefile.linux') diff --git a/linux/Makefile.linux b/linux/Makefile.linux index 0f14540d..8a41f880 100644 --- a/linux/Makefile.linux +++ b/linux/Makefile.linux @@ -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/generic/Makefile.linux,v 1.23 1999/07/02 17:46:30 faith Exp $ -# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux,v 1.5 2000/02/14 06:27:25 martin Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux,v 1.6 2000/02/23 04:47:25 martin Exp $ # .SUFFIXES: -- cgit v1.2.3