PERFORCE change 30272 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=30272

Change 30272 by peter at peter_daintree on 2003/04/30 21:26:18

	IFC @30271

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#8 integrate
.. //depot/projects/hammer/sys/dev/fb/fbreg.h#8 integrate
.. //depot/projects/hammer/sys/dev/fb/vga.c#10 integrate
.. //depot/projects/hammer/sys/dev/kbd/atkbdc.c#5 integrate
.. //depot/projects/hammer/sys/isa/vga_isa.c#5 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#8 (text+ko) ====

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.564 2003/05/01 01:05:21 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.565 2003/05/01 04:18:02 peter Exp $
  */
 
 #include "opt_atalk.h"

==== //depot/projects/hammer/sys/dev/fb/fbreg.h#8 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/fb/fbreg.h,v 1.14 2003/04/29 07:06:44 marcel Exp $
+ * $FreeBSD: src/sys/dev/fb/fbreg.h,v 1.15 2003/05/01 04:21:05 peter Exp $
  */
 
 #ifndef _DEV_FB_FBREG_H_

==== //depot/projects/hammer/sys/dev/fb/vga.c#10 (text+ko) ====

@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/fb/vga.c,v 1.24 2003/03/25 00:07:00 jake Exp $
+ * $FreeBSD: src/sys/dev/fb/vga.c,v 1.25 2003/05/01 04:21:05 peter Exp $
  */
 
 #include "opt_vga.h"

==== //depot/projects/hammer/sys/dev/kbd/atkbdc.c#5 (text+ko) ====

@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/kbd/atkbdc.c,v 1.12 2002/08/19 23:58:37 peter Exp $
+ * $FreeBSD: src/sys/dev/kbd/atkbdc.c,v 1.13 2003/05/01 04:19:19 peter Exp $
  * from kbdio.c,v 1.13 1998/09/25 11:55:46 yokota Exp
  */
 

==== //depot/projects/hammer/sys/isa/vga_isa.c#5 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/isa/vga_isa.c,v 1.23 2003/03/25 00:07:03 jake Exp $
+ * $FreeBSD: src/sys/isa/vga_isa.c,v 1.24 2003/05/01 04:23:15 peter Exp $
  */
 
 #include "opt_vga.h"