summaryrefslogtreecommitdiffstats
path: root/Documentation/sysfs-rules.txt
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-06-07 11:34:59 +0200
committerIngo Molnar <mingo@elte.hu>2009-06-07 11:35:05 +0200
commit56fdd18c7b89a2fac1dfe5d54750c9143867fdc4 (patch)
treece48eee7d5960936fa6e385320b7a261a8bee071 /Documentation/sysfs-rules.txt
parentdma-debug: change hash_bucket_find from first-fit to best-fit (diff)
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anh... (diff)
downloadlinux-56fdd18c7b89a2fac1dfe5d54750c9143867fdc4.tar.xz
linux-56fdd18c7b89a2fac1dfe5d54750c9143867fdc4.zip
Merge branch 'linus' into core/iommu
Merge reason: This branch was on an -rc5 base so pull almost-2.6.30 to resync with the latest upstream fixes and make sure the combination works fine. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/sysfs-rules.txt')
-rw-r--r--Documentation/sysfs-rules.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/sysfs-rules.txt b/Documentation/sysfs-rules.txt
index 6049a2a84dda..5d8bc2cd250c 100644
--- a/Documentation/sysfs-rules.txt
+++ b/Documentation/sysfs-rules.txt
@@ -113,7 +113,7 @@ versions of the sysfs interface.
"devices" directory at /sys/subsystem/<name>/devices.
If /sys/subsystem exists, /sys/bus, /sys/class and /sys/block can be
- ignored. If it does not exist, you have always to scan all three
+ ignored. If it does not exist, you always have to scan all three
places, as the kernel is free to move a subsystem from one place to
the other, as long as the devices are still reachable by the same
subsystem name.