---

yaml
---
r: 175827
b: refs/heads/master
c: ad65776
h: refs/heads/master
i:
  175825: 2eb680e
  175823: b1c8e5f
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51badebdcf394cc5fd574a524b55b3f6085e5e9c
+refs/heads/master: ad6577629acf8a3f47165248ca7ccc0d94673ada

trunk/Documentation/ABI/testing/sysfs-devices-system-cpu

@@ -62,21 +62,6 @@ Description:	CPU topology files that describe kernel limits related to
 		See Documentation/cputopology.txt for more information.
 
 
-What:		/sys/devices/system/cpu/probe
-		/sys/devices/system/cpu/release
-Date:		November 2009
-Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>
-Description:	Dynamic addition and removal of CPU's.  This is not hotplug
-		removal, this is meant complete removal/addition of the CPU
-		from the system.
-
-		probe: writes to this file will dynamically add a CPU to the
-		system.  Information written to the file to add CPU's is
-		architecture specific.
-
-		release: writes to this file dynamically remove a CPU from
-		the system.  Information writtento the file to remove CPU's
-		is architecture specific.
 
 What:		/sys/devices/system/cpu/cpu#/node
 Date:		October 2009

trunk/Documentation/cpu-hotplug.txt

@@ -49,12 +49,6 @@ maxcpus=n    Restrict boot time cpus to n. Say if you have 4 cpus, using
 additional_cpus=n (*)	Use this to limit hotpluggable cpus. This option sets
   			cpu_possible_map = cpu_present_map + additional_cpus
 
-cede_offline={"off","on"}  Use this option to disable/enable putting offlined
-		            processors to an extended H_CEDE state on
-			    supported pseries platforms.
-			    If nothing is specified,
-			    cede_offline is set to "on".
-
 (*) Option valid only for following architectures
 - ia64
 

trunk/Documentation/filesystems/ocfs2.txt

@@ -20,16 +20,15 @@ Lots of code taken from ext3 and other projects.
 Authors in alphabetical order:
 Joel Becker   <joel.becker@oracle.com>
 Zach Brown    <zach.brown@oracle.com>
-Mark Fasheh   <mfasheh@suse.com>
+Mark Fasheh   <mark.fasheh@oracle.com>
 Kurt Hackel   <kurt.hackel@oracle.com>
-Tao Ma        <tao.ma@oracle.com>
 Sunil Mushran <sunil.mushran@oracle.com>
 Manish Singh  <manish.singh@oracle.com>
-Tiger Yang    <tiger.yang@oracle.com>
 
 Caveats
 =======
 Features which OCFS2 does not support yet:
+	- quotas
 	- Directory change notification (F_NOTIFY)
 	- Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease)
 
@@ -71,6 +70,7 @@ commit=nrsec	(*)	Ocfs2 can be told to sync all its data and metadata
 			performance.
 localalloc=8(*)		Allows custom localalloc size in MB. If the value is too
 			large, the fs will silently revert it to the default.
+			Localalloc is not enabled for local mounts.
 localflocks		This disables cluster aware flock.
 inode64			Indicates that Ocfs2 is allowed to create inodes at
 			any location in the filesystem, including those which

trunk/Documentation/i2c/busses/i2c-piix4

@@ -8,7 +8,7 @@ Supported adapters:
     Datasheet: Only available via NDA from ServerWorks
   * ATI IXP200, IXP300, IXP400, SB600, SB700 and SB800 southbridges
     Datasheet: Not publicly available
-  * AMD Hudson-2
+  * AMD SB900
     Datasheet: Not publicly available
   * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge
     Datasheet: Publicly available at the SMSC website http://www.smsc.com

trunk/Documentation/powerpc/dts-bindings/fsl/board.txt

@@ -20,16 +20,12 @@ Required properities:
 - compatible : should be "fsl,fpga-pixis".
 - reg : should contain the address and the length of the FPPGA register
   set.
-- interrupt-parent: should specify phandle for the interrupt controller.
-- interrupts : should specify event (wakeup) IRQ.
 
 Example (MPC8610HPCD):
 
 	board-control@e8000000 {
 		compatible = "fsl,fpga-pixis";
 		reg = <0xe8000000 32>;
-		interrupt-parent = <&mpic>;
-		interrupts = <8 8>;
 	};
 
 * Freescale BCSR GPIO banks