Module Name: src Committed By: pgoyette Date: Wed Apr 26 02:57:17 UTC 2017
Modified Files: src/sys/arch/sh3/include [pgoyette-localcount]: ieeefp.h src/sys/dev/pci [pgoyette-localcount]: piixpm.c Log Message: Resolve a couple of conflicts To generate a diff of this commit: cvs rdiff -u -r1.4.62.1 -r1.4.62.2 src/sys/arch/sh3/include/ieeefp.h cvs rdiff -u -r1.49.2.3 -r1.49.2.4 src/sys/dev/pci/piixpm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.