mellon 2a1b799fda Clean up conflicts during merge (thomas de-970603)

1997-06-06 23:14:58 +00:00

..

adosfs

…

arch

Pull thorpej-bus-dma branch into mainline.

1997-06-06 23:14:22 +00:00

compat

PR/3701: Arne H. Juul: olstat can't stat "/", because it still pretended

1997-06-06 19:36:31 +00:00

conf

…

ddb

…

dev

Clean up conflicts during merge (thomas de-970603)

1997-06-06 23:14:58 +00:00

gdbscripts

…

ipkdb

…

isofs/cd9660

…

kern

Add HW_MACHINE_ARCH for the new sysctl hw.machine_arch which contains the

1997-06-06 23:14:36 +00:00

lib

Back out BUILDDIR and NOINSTALL changes.

1997-05-31 21:21:13 +00:00

lkm

Fix several bugs/warnings:

1997-05-28 02:49:06 +00:00

miscfs

…

msdosfs

…

net

…

netatalk

…

netccitt

…

netinet

Fix urgent pointer overflow problems when used with large windows

1997-06-03 16:17:09 +00:00

netiso

…

netnatm

…

netns

…

nfs

…

scsi

…

stand

…

sys

Add HW_MACHINE_ARCH for the new sysctl hw.machine_arch which contains the

1997-06-06 23:14:36 +00:00

ufs

…

vm

Pull thorpej-bus-dma branch into mainline.

1997-06-06 23:10:23 +00:00

Makefile

Back out BUILDDIR and NOINSTALL changes.

1997-05-31 21:21:13 +00:00