diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-11-12 09:09:01 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-11-12 09:09:01 -0500 |
| commit | 890ca861f868a10617029ffc87eae7d48ea6876c (patch) | |
| tree | 713383f4e3bbd94ddb9816a25e6b3911511908f1 /lib/rbtree.c | |
| parent | 03452d27c6cd9cebb59a6bb0fb6bd8557916c263 (diff) | |
| parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) | |
Merge tag 'v3.18-rc4' into x86/cleanups, to refresh the tree before pulling new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib/rbtree.c')
| -rw-r--r-- | lib/rbtree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rbtree.c b/lib/rbtree.c index 65f4effd117f..c16c81a3d430 100644 --- a/lib/rbtree.c +++ b/lib/rbtree.c | |||
| @@ -101,7 +101,7 @@ __rb_insert(struct rb_node *node, struct rb_root *root, | |||
| 101 | * / \ / \ | 101 | * / \ / \ |
| 102 | * p u --> P U | 102 | * p u --> P U |
| 103 | * / / | 103 | * / / |
| 104 | * n N | 104 | * n n |
| 105 | * | 105 | * |
| 106 | * However, since g's parent might be red, and | 106 | * However, since g's parent might be red, and |
| 107 | * 4) does not allow this, we need to recurse | 107 | * 4) does not allow this, we need to recurse |