---

yaml
---
r: 211431
b: refs/heads/master
c: d4cfa4d
h: refs/heads/master
i:
  211429: 0559ee9
  211427: f973ec1
  211423: 1057ded
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85a331881dd52a93e7d4c57bcaf5486cc8718465
+refs/heads/master: d4cfa4d12f46e2520f4c1d1a92e891ce068b7464

trunk/Documentation/networking/ixgbevf.txt

@@ -1,16 +1,19 @@
 Linux* Base Driver for Intel(R) Network Connection
 ==================================================
 
-Intel Gigabit Linux driver.
-Copyright(c) 1999 - 2010 Intel Corporation.
+November 24, 2009
 
 Contents
 ========
 
+- In This Release
 - Identifying Your Adapter
 - Known Issues/Troubleshooting
 - Support
 
+In This Release
+===============
+
 This file describes the ixgbevf Linux* Base Driver for Intel Network
 Connection.
 
@@ -30,7 +33,7 @@ Identifying Your Adapter
 For more information on how to identify your adapter, go to the Adapter &
 Driver ID Guide at:
 
-    http://support.intel.com/support/go/network/adapter/idguide.htm
+    http://support.intel.com/support/network/sb/CS-008441.htm
 
 Known Issues/Troubleshooting
 ============================
@@ -54,3 +57,34 @@ or the Intel Wired Networking project hosted by Sourceforge at:
 If an issue is identified with the released source code on the supported
 kernel with a supported adapter, email the specific information related
 to the issue to e1000-devel@lists.sf.net
+
+License
+=======
+
+Intel 10 Gigabit Linux driver.
+Copyright(c) 1999 - 2009 Intel Corporation.
+
+This program is free software; you can redistribute it and/or modify it
+under the terms and conditions of the GNU General Public License,
+version 2, as published by the Free Software Foundation.
+
+This program is distributed in the hope it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+
+The full GNU General Public License is included in this distribution in
+the file called "COPYING".
+
+Trademarks
+==========
+
+Intel, Itanium, and Pentium are trademarks or registered trademarks of
+Intel Corporation or its subsidiaries in the United States and other
+countries.
+
+* Other names and brands may be claimed as the property of others.

trunk/Documentation/vm/page-types.c

@@ -478,7 +478,7 @@ static void prepare_hwpoison_fd(void)
 	}
 
 	if (opt_unpoison && !hwpoison_forget_fd) {
-		sprintf(buf, "%s/unpoison-pfn", hwpoison_debug_fs);
+		sprintf(buf, "%s/renew-pfn", hwpoison_debug_fs);
 		hwpoison_forget_fd = checked_open(buf, O_WRONLY);
 	}
 }