---

yaml
---
r: 117717
b: refs/heads/master
c: fbd1b17
h: refs/heads/master
i:
  117715: 3bed346
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fca5ccf97d2c28bcfce44f5b07d85e74e3cd18e
+refs/heads/master: fbd1b17b43b8783a5408ec18c293dd8ebdc7e2cd

trunk/CREDITS

@@ -598,11 +598,6 @@ S: Tamsui town, Taipei county,
 S: Taiwan 251
 S: Republic of China
 
-N: Reinette Chatre
-E: reinette.chatre@intel.com
-D: WiMedia Link Protocol implementation
-D: UWB stack bits and pieces
-
 N: Michael Elizabeth Chastain
 E: mec@shout.net
 D: Configure, Menuconfig, xconfig
@@ -1658,14 +1653,14 @@ S: Chapel Hill, North Carolina 27514-4818
 S: USA
 
 N: Dave Jones
-E: davej@redhat.com
+E: davej@codemonkey.org.uk
 W: http://www.codemonkey.org.uk
-D: Assorted VIA x86 support.
-D: 2.5 AGPGART overhaul.
+D: x86 errata/setup maintenance.
+D: AGPGART driver.
 D: CPUFREQ maintenance.
-D: Fedora kernel maintainence.
-D: Misc/Other.
-S: 314 Littleton Rd, Westford, MA 01886, USA
+D: Backport/Forwardport merge monkey.
+D: Various Janitor work.
+S: United Kingdom
 
 N: Martin Josfsson
 E: gandalf@wlug.westbo.se
@@ -2700,12 +2695,6 @@ S: Demonstratsii 8-382
 S: Tula 300000
 S: Russia
 
-N: Inaky Perez-Gonzalez
-E: inaky.perez-gonzalez@intel.com
-D: UWB stack, HWA-RC driver and HWA-HC drivers
-D: Wireless USB additions to the USB stack
-D: WiMedia Link Protocol bits and pieces
-
 N: Gordon Peters
 E: GordPeters@smarttech.com
 D: Isochronous receive for IEEE 1394 driver (OHCI module).

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

@@ -101,46 +101,3 @@ Description:
 Users:
 		USB PM tool
 		git://git.moblin.org/users/sarah/usb-pm-tool/
-
-What:		/sys/bus/usb/device/.../authorized
-Date:		July 2008
-KernelVersion:	2.6.26
-Contact:	David Vrabel <david.vrabel@csr.com>
-Description:
-		Authorized devices are available for use by device
-		drivers, non-authorized one are not.  By default, wired
-		USB devices are authorized.
-
-		Certified Wireless USB devices are not authorized
-		initially and should be (by writing 1) after the
-		device has been authenticated.
-
-What:		/sys/bus/usb/device/.../wusb_cdid
-Date:		July 2008
-KernelVersion:	2.6.27
-Contact:	David Vrabel <david.vrabel@csr.com>
-Description:
-		For Certified Wireless USB devices only.
-
-		A devices's CDID, as 16 space-separated hex octets.
-
-What:		/sys/bus/usb/device/.../wusb_ck
-Date:		July 2008
-KernelVersion:	2.6.27
-Contact:	David Vrabel <david.vrabel@csr.com>
-Description:
-		For Certified Wireless USB devices only.
-
-		Write the device's connection key (CK) to start the
-		authentication of the device.  The CK is 16
-		space-separated hex octets.
-
-What:		/sys/bus/usb/device/.../wusb_disconnect
-Date:		July 2008
-KernelVersion:	2.6.27
-Contact:	David Vrabel <david.vrabel@csr.com>
-Description:
-		For Certified Wireless USB devices only.
-
-		Write a 1 to force the device to disconnect
-		(equivalent to unplugging a wired USB device).