K 10
svn:author
V 3
gjb
K 8
svn:date
V 27
2017-11-30T15:54:14.677762Z
K 7
svn:log
V 163
Correct a mismerge of r325861, committed as r326017, to fix the
RPI2 SoC image build.

This is a direct commit to stable/11.

Sponsored by:	The FreeBSD Foundation

END