Shawn Webb 9cbb7d4cae Merge remote-tracking branch 'origin/freebsd/current/master' into hardened/current/master ... Conflicts: sys/i386/svr4/svr4_machdep.c (removed)		2016-04-23 11:44:20 -04:00
..
acpica	SRAT: Don't overflow domain_pxm table	2016-04-20 01:10:07 +00:00
bios
cpufreq
include	Merge branch 'freebsd/current/master' into hardened/current/master	2016-04-16 11:26:10 +02:00
iommu	sys: use our roundup2/rounddown2() macros when param.h is available.	2016-04-21 19:57:40 +00:00
isa	X86: use our nitems() macro when it is avaliable through param.h.	2016-04-19 23:41:46 +00:00
pci
x86	X86: use our nitems() macro when it is avaliable through param.h.	2016-04-19 23:41:46 +00:00
xen