diff options
author | James Morris <jmorris@namei.org> | 2010-11-28 16:27:07 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-11-28 16:27:07 -0500 |
commit | 1d6d75684d869406e5bb2ac5d3ed9454f52d0cab (patch) | |
tree | afb229254bed6415407b7b7d4641f9f792109966 /Documentation/rbtree.txt | |
parent | 074e61ec3751da9ab88ee66d3818574556c03489 (diff) | |
parent | 0f639a3c5ca63dd76ee07de9b02ebf0178ce9a17 (diff) |
Merge branch 'master' into next
Diffstat (limited to 'Documentation/rbtree.txt')
-rw-r--r-- | Documentation/rbtree.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/rbtree.txt b/Documentation/rbtree.txt index 221f38be98f4..19f8278c3854 100644 --- a/Documentation/rbtree.txt +++ b/Documentation/rbtree.txt | |||
@@ -21,8 +21,8 @@ three rotations, respectively, to balance the tree), with slightly slower | |||
21 | To quote Linux Weekly News: | 21 | To quote Linux Weekly News: |
22 | 22 | ||
23 | There are a number of red-black trees in use in the kernel. | 23 | There are a number of red-black trees in use in the kernel. |
24 | The anticipatory, deadline, and CFQ I/O schedulers all employ | 24 | The deadline and CFQ I/O schedulers employ rbtrees to |
25 | rbtrees to track requests; the packet CD/DVD driver does the same. | 25 | track requests; the packet CD/DVD driver does the same. |
26 | The high-resolution timer code uses an rbtree to organize outstanding | 26 | The high-resolution timer code uses an rbtree to organize outstanding |
27 | timer requests. The ext3 filesystem tracks directory entries in a | 27 | timer requests. The ext3 filesystem tracks directory entries in a |
28 | red-black tree. Virtual memory areas (VMAs) are tracked with red-black | 28 | red-black tree. Virtual memory areas (VMAs) are tracked with red-black |