Shawn Webb f3ad60380e HBSD: Resolve merge conflicts ... Signed-off-by: Shawn Webb <shawn.webb@hardenedbsd.org>		2024-11-12 12:47:00 -07:00
..
arm64
common
defaults	Merge branch 'freebsd/current/main' into hardened/current/master	2024-10-19 18:01:45 -06:00
efi	Merge branch 'freebsd/current/main' into hardened/current/master	2024-11-02 18:01:27 -06:00
fdt
ficl
ficl32
fonts
forth	Merge branch 'freebsd/current/main' into hardened/current/master	2024-10-11 18:01:43 -06:00
i386	Merge branch 'freebsd/current/main' into hardened/current/master	2024-10-28 18:01:44 -06:00
images
kboot	loader.kboot: Build on amd64	2024-11-07 16:23:26 -07:00
kshim
liblua
liblua32
libofw
libsa	manuals: Misc syntax fixes	2024-10-28 12:26:03 -03:00
libsa32
lua	Merge branch 'freebsd/current/main' into hardened/current/master	2024-11-02 18:01:27 -06:00
man	manuals: Remove trailing spaces	2024-11-04 11:26:14 -04:00
powerpc	loader/powerpc: Add some CAS support for newer POWER CPUs	2024-10-11 17:17:43 -04:00
uboot	loader: update dependencies for dirdeps build	2024-09-18 11:22:34 -04:00
usb
userboot
defs.mk	HBSD: Resolve merge conflicts	2024-11-12 12:47:00 -07:00
fdt.mk
ficl.mk
loader.mk	Merge branch 'freebsd/current/main' into hardened/current/master	2024-10-25 00:01:55 -06:00
lua.mk
Makefile	loader.kboot: Build on amd64	2024-11-07 16:23:26 -07:00
Makefile.amd64
Makefile.inc
veriexec.mk	libsecureboot do not report expected unverified files	2024-02-12 14:35:01 -08:00