Index: stable/11/tools/build/options/WITHOUT_LOADER_GEIL
===================================================================
--- stable/11/tools/build/options/WITHOUT_LOADER_GEIL	(revision 329168)
+++ stable/11/tools/build/options/WITHOUT_LOADER_GEIL	(nonexistent)
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Disable inclusion of GELI crypto support in the boot chain binaries.

Property changes on: stable/11/tools/build/options/WITHOUT_LOADER_GEIL
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: stable/11/tools/build/options/WITHOUT_LOADER_GELI
===================================================================
--- stable/11/tools/build/options/WITHOUT_LOADER_GELI	(nonexistent)
+++ stable/11/tools/build/options/WITHOUT_LOADER_GELI	(revision 329169)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Disable inclusion of GELI crypto support in the boot chain binaries.

Property changes on: stable/11/tools/build/options/WITHOUT_LOADER_GELI
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: stable/11
===================================================================
--- stable/11	(revision 329168)
+++ stable/11	(revision 329169)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r325718