---

yaml
---
r: 175006
b: refs/heads/master
c: 68ea809
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 748e566b7e24541e05e3e70be311887a1262f2a1
+refs/heads/master: 68ea809af47d8a4dd92dd3a8720882767fdf51b6

trunk/Documentation/ABI/testing/sysfs-bus-usb

@@ -144,16 +144,3 @@ Description:
 
 		Write a 1 to force the device to disconnect
 		(equivalent to unplugging a wired USB device).
-
-What:		/sys/bus/usb/drivers/.../remove_id
-Date:		November 2009
-Contact:	CHENG Renquan <rqcheng@smu.edu.sg>
-Description:
-		Writing a device ID to this file will remove an ID
-		that was dynamically added via the new_id sysfs entry.
-		The format for the device ID is:
-		idVendor idProduct.	After successfully
-		removing an ID, the driver will no longer support the
-		device.  This is useful to ensure auto probing won't
-		match the driver to the device.  For example:
-		# echo "046d c315" > /sys/bus/usb/drivers/foo/remove_id

trunk/Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc

@@ -23,16 +23,3 @@ Description:
                 Since this relates to security (specifically, the
                 lifetime of PTKs and GTKs) it should not be changed
                 from the default.
-
-What:           /sys/class/uwb_rc/uwbN/wusbhc/wusb_phy_rate
-Date:           August 2009
-KernelVersion:  2.6.32
-Contact:        David Vrabel <david.vrabel@csr.com>
-Description:
-                The maximum PHY rate to use for all connected devices.
-                This is only of limited use for testing and
-                development as the hardware's automatic rate
-                adaptation is better then this simple control.
-
-                Refer to [ECMA-368] section 10.3.1.1 for the value to
-                use.

trunk/Documentation/filesystems/nilfs2.txt

@@ -49,7 +49,8 @@ Mount options
 NILFS2 supports the following mount options:
 (*) == default
 
-nobarrier		Disables barriers.
+barrier=on(*)		This enables/disables barriers. barrier=off disables
+			it, barrier=on enables it.
 errors=continue(*)	Keep going on a filesystem error.
 errors=remount-ro	Remount the filesystem read-only on an error.
 errors=panic		Panic and halt the machine if an error occurs.
@@ -70,10 +71,6 @@ order=strict		Apply strict in-order semantics that preserves sequence
 			blocks.  That means, it is guaranteed that no
 			overtaking of events occurs in the recovered file
 			system after a crash.
-norecovery		Disable recovery of the filesystem on mount.
-			This disables every write access on the device for
-			read-only mounts or snapshots.  This option will fail
-			for r/w mounts on an unclean volume.
 
 NILFS2 usage
 ============

trunk/Documentation/kernel-parameters.txt

@@ -2663,8 +2663,6 @@ and is between 256 and 4096 characters. It is defined in the file
 			to a common usb-storage quirk flag as follows:
 				a = SANE_SENSE (collect more than 18 bytes
 					of sense data);
-				b = BAD_SENSE (don't collect more than 18
-					bytes of sense data);
 				c = FIX_CAPACITY (decrease the reported
 					device capacity by one sector);
 				h = CAPACITY_HEURISTICS (decrease the