---

yaml --- r: 140602 b: refs/heads/master c: c47956d h: refs/heads/master v: v3
git-mirror · Dec 29, 2008 · f9fbdd3 · f9fbdd3
1 parent e13af88
commit f9fbdd3
Show file tree

Hide file tree

Showing 3,199 changed files with 77,516 additions and 201,120 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e80680208ba6ce9635ca7c21ad0019442ea166a
+refs/heads/master: c47956d9ae3341d2d1998bff26620fa3338c01e4
diff --git a/trunk/CREDITS b/trunk/CREDITS
@@ -369,10 +369,10 @@ P: 1024/8462A731 4C 55 86 34 44 59 A7 99  2B 97 88 4A 88 9A 0D 97
 D: sun4 port, Sparc hacker
 
 N: Hugh Blemings
-E: hugh@blemings.org
-W: http://blemings.org/hugh
-D: Original author of the Keyspan USB to serial drivers, random PowerPC hacker
-S: PO Box 234
+E: hugh@misc.nu
+W: http://misc.nu/hugh/
+D: Author and maintainer of the Keyspan USB to Serial drivers
+S: Po Box 234
 S: Belconnen ACT 2616
 S: Australia
 

diff --git a/trunk/Documentation/ABI/testing/debugfs-kmemtrace b/trunk/Documentation/ABI/testing/debugfs-kmemtrace
diff --git a/trunk/Documentation/ABI/testing/sysfs-class-uwb_rc b/trunk/Documentation/ABI/testing/sysfs-class-uwb_rc
@@ -32,16 +32,14 @@ Contact:        linux-usb@vger.kernel.org
 Description:
                 Write:
 
-                <channel>
+                <channel> [<bpst offset>]
 
-                to force a specific channel to be used when beaconing,
-                or, if <channel> is -1, to prohibit beaconing.  If
-                <channel> is 0, then the default channel selection
-                algorithm will be used.  Valid channels depends on the
-                radio controller's supported band groups.
+                to start beaconing on a specific channel, or stop
+                beaconing if <channel> is -1.  Valid channels depends
+                on the radio controller's supported band groups.
 
-                Reading returns the currently active channel, or -1 if
-                the radio controller is not beaconing.
+                <bpst offset> may be used to try and join a specific
+                beacon group if more than one was found during a scan.
 
 What:           /sys/class/uwb_rc/uwbN/scan
 Date:           July 2008

diff --git a/trunk/Documentation/RCU/00-INDEX b/trunk/Documentation/RCU/00-INDEX
@@ -16,8 +16,6 @@ RTFP.txt
 	- List of RCU papers (bibliography) going back to 1980.
 torture.txt
 	- RCU Torture Test Operation (CONFIG_RCU_TORTURE_TEST)
-trace.txt
-	- CONFIG_RCU_TRACE debugfs files and formats
 UP.txt
 	- RCU on Uniprocessor Systems
 whatisRCU.txt