From a4571868b1b1f273bcffde6f1292178e6780b412 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 13 Jul 2015 20:07:11 +0000
Subject: [PATCH] Document r282921, nvd(4) and nvme(4) included in GENERIC. Add
 Intel to sponsors.ent (note, &intel; cannot be used here).

Sponsored by:	The FreeBSD Foundation
---
 release/doc/en_US.ISO8859-1/relnotes/article.xml | 5 +++++
 release/doc/share/xml/sponsor.ent                | 1 +
 2 files changed, 6 insertions(+)

diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.xml b/release/doc/en_US.ISO8859-1/relnotes/article.xml
index de62dead152..86f86b5edc7 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.xml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.xml
@@ -770,6 +770,11 @@
 	&powerpc; processors has been overhaulded to improve
 	concurrency.</para>
 
+      <para revision="282921" contrib="sponsor" sponsor="&intelcorp;"
+	arch="amd64,i386">The &man.nvd.4; and &man.nvme.4; drivers are
+	now included in the <filename>GENERIC</filename> kernel
+	configuration by default.</para>
+
       <para revision="283959" contrib="sponsor"
 	sponsor="&limelight;">A new kernel configuration option,
 	<literal>EM_MULTIQUEUE</literal>, has been added which enables
diff --git a/release/doc/share/xml/sponsor.ent b/release/doc/share/xml/sponsor.ent
index c9810614a9e..b504261f0a0 100644
--- a/release/doc/share/xml/sponsor.ent
+++ b/release/doc/share/xml/sponsor.ent
@@ -27,6 +27,7 @@
 
 <!ENTITY juniper	"Juniper Networks, Inc.">
 
+<!ENTITY intelcorp	"Intel Corporation">
 <!ENTITY ix		"iXsystems">
 
 <!ENTITY limelight	"Limelight Networks">