Jordan K. Hubbard 8dd4744e1a Fix merge spam ... Spotted by: Alex Nash		1997-09-23 16:28:00 +00:00
..
apm	Convert to the new callout interface.	1997-09-21 21:33:10 +00:00
bios	Convert to the new callout interface.	1997-09-21 21:33:10 +00:00
boot	Remove pbzero(), things we load zero their own bss.	1997-08-31 06:11:26 +00:00
conf	Fix merge spam	1997-09-23 16:28:00 +00:00
eisa	Add shared EISA interrupt support.	1997-09-21 21:35:24 +00:00
i386	Turn on CR4_VME on the AP's the same as the BSP. Note that we do not	1997-09-22 05:03:03 +00:00
ibcs2	Change the M_NAMEI allocations to use the zone allocator. This change	1997-09-21 04:24:27 +00:00
include	ipl.h:	1997-09-21 21:38:54 +00:00
isa	Add a missing bufq_init call. The original code never initialized it's	1997-09-22 22:58:08 +00:00
linux	Update for changes in the callout interface.	1997-09-21 21:43:54 +00:00
pci	Removed unused #includes.	1997-07-20 14:10:18 +00:00
scsi	Update for changes in the callout interface.	1997-09-21 21:43:54 +00:00
Makefile	Back out part 1 of the MCFH that changed $Id$ to $FreeBSD$. We are not	1997-02-22 09:48:43 +00:00