From 4eff8b2977f3c7d4d557b96956ac4b1c3758b306 Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oliver@neukum.org>
Date: Fri, 12 Mar 2010 11:27:21 +0100
Subject: [PATCH] --- yaml --- r: 188765 b: refs/heads/master c:
 1e63ef0e0c2cfb5deb9331420c9857fbe04bea73 h: refs/heads/master i:   188763:
 38be893618d6ce770c252c39e8a4886c5b882048 v: v3

---
 [refs]                                        | 2 +-
 trunk/Documentation/ABI/testing/sysfs-bus-usb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a7dd30cb58c0..d15a1e59dfd2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b04872aa75006e2a4adaaec21e9c9ede8b8ad9d
+refs/heads/master: 1e63ef0e0c2cfb5deb9331420c9857fbe04bea73
diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-usb b/trunk/Documentation/ABI/testing/sysfs-bus-usb
index a986e9bbba3d..bcebb9eaedce 100644
--- a/trunk/Documentation/ABI/testing/sysfs-bus-usb
+++ b/trunk/Documentation/ABI/testing/sysfs-bus-usb
@@ -160,7 +160,7 @@ Description:
 		match the driver to the device.  For example:
 		# echo "046d c315" > /sys/bus/usb/drivers/foo/remove_id
 
-What:		/sys/bus/usb/device/.../avoid_reset
+What:		/sys/bus/usb/device/.../avoid_reset_quirk
 Date:		December 2009
 Contact:	Oliver Neukum <oliver@neukum.org>
 Description: