---

yaml --- r: 189221 b: refs/heads/master c: ee860b6 h: refs/heads/master i: 189219: b74d8bf v: v3
git-mirror · Mar 17, 2010 · 7f87add · 7f87add
1 parent 11d13a2
commit 7f87add
Show file tree

Hide file tree

Showing 1,013 changed files with 9,920 additions and 61,761 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f321603724be7386ea39ea41fd885954db60a4a
+refs/heads/master: ee860b6a650360c91f5d5f9a94262aad9be90015
diff --git 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_quirk
+What:		/sys/bus/usb/device/.../avoid_reset
 Date:		December 2009
 Contact:	Oliver Neukum <oliver@neukum.org>
 Description:

diff --git a/trunk/Documentation/DMA-API-HOWTO.txt → trunk/Documentation/PCI/PCI-DMA-mapping.txt b/trunk/Documentation/DMA-API-HOWTO.txt → trunk/Documentation/PCI/PCI-DMA-mapping.txt
diff --git a/trunk/Documentation/cgroups/memory.txt b/trunk/Documentation/cgroups/memory.txt
@@ -340,7 +340,7 @@ Note:
 5.3 swappiness
   Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only.
 
-  Following cgroups' swappiness can't be changed.
+  Following cgroups' swapiness can't be changed.
   - root cgroup (uses /proc/sys/vm/swappiness).
   - a cgroup which uses hierarchy and it has child cgroup.
   - a cgroup which uses hierarchy and not the root of hierarchy.

diff --git a/trunk/Documentation/circular-buffers.txt b/trunk/Documentation/circular-buffers.txt
diff --git a/trunk/Documentation/filesystems/00-INDEX b/trunk/Documentation/filesystems/00-INDEX
@@ -16,8 +16,6 @@ befs.txt
 	- information about the BeOS filesystem for Linux.
 bfs.txt
 	- info for the SCO UnixWare Boot Filesystem (BFS).
-ceph.txt
-	- info for the Ceph Distributed File System
 cifs.txt
 	- description of the CIFS filesystem.
 coda.txt