diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-29 04:02:15 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-29 04:02:20 -0400 |
| commit | 9de09ace8d518141a4375e1d216ab64db4377799 (patch) | |
| tree | da8e7a77f4ea91eb3bb73fc6da72ecf8c99e1c16 /Documentation/infiniband/user_verbs.txt | |
| parent | 1beee96bae0daf7f491356777c3080cc436950f5 (diff) | |
| parent | 6d3f1e12f46a2f9a1bb7e7aa433df8dd31ce5647 (diff) | |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up fixes and move base from -rc1 to -rc5.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/infiniband/user_verbs.txt')
| -rw-r--r-- | Documentation/infiniband/user_verbs.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/infiniband/user_verbs.txt b/Documentation/infiniband/user_verbs.txt index f847501e50b5..afe3f8da9018 100644 --- a/Documentation/infiniband/user_verbs.txt +++ b/Documentation/infiniband/user_verbs.txt | |||
| @@ -58,7 +58,7 @@ Memory pinning | |||
| 58 | To create the appropriate character device files automatically with | 58 | To create the appropriate character device files automatically with |
| 59 | udev, a rule like | 59 | udev, a rule like |
| 60 | 60 | ||
| 61 | KERNEL="uverbs*", NAME="infiniband/%k" | 61 | KERNEL=="uverbs*", NAME="infiniband/%k" |
| 62 | 62 | ||
| 63 | can be used. This will create device nodes named | 63 | can be used. This will create device nodes named |
| 64 | 64 | ||