jmcneill 605c40cf54 merge conflicts

2017-10-28 10:35:04 +00:00

..

bsd

Update the kernhist(9) kernel history code to address issues identified

2017-10-28 00:37:11 +00:00

gpl2/dts

merge conflicts

2017-10-28 10:35:04 +00:00

isc/atheros_hal

…