---

yaml --- r: 309406 b: refs/heads/master c: 6a31e1f h: refs/heads/master v: v3
git-mirror · May 23, 2012 · 6b19403 · 6b19403
1 parent 0b09db2
commit 6b19403
Show file tree

Hide file tree

Showing 8,456 changed files with 342,689 additions and 509,195 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42fe55ce905212542426fa6407a76534a5fb696a
+refs/heads/master: 6a31e1f135d1abfb5137697f889c8cd5d72eb522
diff --git a/trunk/CREDITS b/trunk/CREDITS
@@ -3814,8 +3814,8 @@ D: INFO-SHEET, former maintainer
 D: Author of the longest-living linux bug
 
 N: Jonathan Woithe
-E: jwoithe@just42.net
-W: http:/www.just42.net/jwoithe
+E: jwoithe@physics.adelaide.edu.au
+W: http://www.physics.adelaide.edu.au/~jwoithe
 D: ALS-007 sound card extensions to Sound Blaster driver
 S: 20 Jordan St
 S: Valley View, SA 5093

diff --git a/trunk/Documentation/00-INDEX b/trunk/Documentation/00-INDEX
@@ -218,6 +218,8 @@ m68k/
 	- directory with info about Linux on Motorola 68k architecture.
 magic-number.txt
 	- list of magic numbers used to mark/protect kernel data structures.
+mca.txt
+	- info on supporting Micro Channel Architecture (e.g. PS/2) systems.
 md.txt
 	- info on boot arguments for the multiple devices driver.
 memory-barriers.txt

diff --git a/trunk/Documentation/ABI/removed/ip_queue b/trunk/Documentation/ABI/removed/ip_queue
diff --git a/trunk/Documentation/ABI/testing/debugfs-pfo-nx-crypto b/trunk/Documentation/ABI/testing/debugfs-pfo-nx-crypto
diff --git a/trunk/Documentation/ABI/testing/dev-kmsg b/trunk/Documentation/ABI/testing/dev-kmsg
diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-i2c-devices-lm3533 b/trunk/Documentation/ABI/testing/sysfs-bus-i2c-devices-lm3533
diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-usb b/trunk/Documentation/ABI/testing/sysfs-bus-usb
@@ -135,17 +135,6 @@ Description:
 		for the device and attempt to bind to it.  For example:
 		# echo "8086 10f5" > /sys/bus/usb/drivers/foo/new_id
 
-		Reading from this file will list all dynamically added
-		device IDs in the same format, with one entry per
-		line. For example:
-		# cat /sys/bus/usb/drivers/foo/new_id
-		8086 10f5
-		dead beef 06
-		f00d cafe
-
-		The list will be truncated at PAGE_SIZE bytes due to
-		sysfs restrictions.
-
 What:		/sys/bus/usb-serial/drivers/.../new_id
 Date:		October 2011
 Contact:	linux-usb@vger.kernel.org
@@ -168,10 +157,6 @@ Description:
 		match the driver to the device.  For example:
 		# echo "046d c315" > /sys/bus/usb/drivers/foo/remove_id
 
-		Reading from this file will list the dynamically added
-		device IDs, exactly like reading from the entry
-		"/sys/bus/usb/drivers/.../new_id"
-
 What:		/sys/bus/usb/device/.../avoid_reset_quirk
 Date:		December 2009
 Contact:	Oliver Neukum <oliver@neukum.org>
@@ -204,7 +189,7 @@ Contact:	Matthew Garrett <mjg@redhat.com>
 Description:
 		Some information about whether a given USB device is
 		physically fixed to the platform can be inferred from a
-		combination of hub descriptor bits and platform-specific data
+		combination of hub decriptor bits and platform-specific data
 		such as ACPI. This file will read either "removable" or
 		"fixed" if the information is available, and "unknown"
-		otherwise.
+		otherwise.
diff --git a/trunk/Documentation/ABI/testing/sysfs-class-backlight-driver-lm3533 b/trunk/Documentation/ABI/testing/sysfs-class-backlight-driver-lm3533
diff --git a/trunk/Documentation/ABI/testing/sysfs-class-extcon b/trunk/Documentation/ABI/testing/sysfs-class-extcon