Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/compat/linux/arch/i386/linux_machdep.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/compat/linux/arch/i386/linux_machdep.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- src/sys/compat/linux/arch/i386/linux_machdep.c	2008/04/24 18:39:22	1.135
+++ src/sys/compat/linux/arch/i386/linux_machdep.c	2008/04/28 20:23:42	1.136
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_machdep.c,v 1.135 2008/04/24 18:39:22 ad Exp $	*/
+/*	$NetBSD: linux_machdep.c,v 1.136 2008/04/28 20:23:42 martin Exp $	*/
 
 /*-
  * Copyright (c) 1995, 2000, 2008 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -37,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.135 2008/04/24 18:39:22 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.136 2008/04/28 20:23:42 martin Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_vm86.h"