---

yaml
---
r: 88127
b: refs/heads/master
c: 2eccd6f
h: refs/heads/master
i:
  88125: c63d11c
  88123: f18494d
  88119: 044100a
  88111: 057758b
  88095: 1bda9a7
  88063: 6c3bac0
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0035a1dc8f56f2c92f4246b0c8b5f6d1ee10c76b
+refs/heads/master: 2eccd6f65a0d4844318b1e30755cafd063833908

trunk/Documentation/SubmittingPatches

@@ -512,7 +512,7 @@ They provide type safety, have no length limitations, no formatting
 limitations, and under gcc they are as cheap as macros.
 
 Macros should only be used for cases where a static inline is clearly
-suboptimal [there a few, isolated cases of this in fast paths],
+suboptimal [there are a few, isolated cases of this in fast paths],
 or where it is impossible to use a static inline function [such as
 string-izing].
 

trunk/Documentation/kernel-parameters.txt

@@ -170,11 +170,6 @@ and is between 256 and 4096 characters. It is defined in the file
 	acpi_irq_isa=	[HW,ACPI] If irq_balance, mark listed IRQs used by ISA
 			Format: <irq>,<irq>...
 
-	acpi_new_pts_ordering [HW,ACPI]
-			Enforce the ACPI 2.0 ordering of the _PTS control
-			method wrt putting devices into low power states
-			default: pre ACPI 2.0 ordering of _PTS
-
 	acpi_no_auto_ssdt	[HW,ACPI] Disable automatic loading of SSDT
 
 	acpi_os_name=	[HW,ACPI] Tell ACPI BIOS the name of the OS

trunk/Documentation/networking/00-INDEX

@@ -84,9 +84,6 @@ policy-routing.txt
 	- IP policy-based routing
 ray_cs.txt
 	- Raylink Wireless LAN card driver info.
-sk98lin.txt
-	- Marvell Yukon Chipset / SysKonnect SK-98xx compliant Gigabit
-	  Ethernet Adapter family driver info
 skfp.txt
 	- SysKonnect FDDI (SK-5xxx, Compaq Netelligent) driver info.
 smc9.txt