diff options
| author | Alexander Graf <agraf@suse.de> | 2012-10-31 08:36:18 -0400 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2012-10-31 08:36:18 -0400 |
| commit | 0588000eac9ba4178cebade437da3b28e8fad48f (patch) | |
| tree | 697e514a0a0193f17a54f372dd18c5cd3927e154 /Documentation/virtual | |
| parent | 8b5869ad85f703ffeb25e656eab826f6b85b984c (diff) | |
| parent | 81c52c56e2b43589091ee29038bcf793d3f184ab (diff) | |
Merge commit 'origin/queue' into for-queue
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/uapi/asm/Kbuild
Diffstat (limited to 'Documentation/virtual')
| -rw-r--r-- | Documentation/virtual/uml/UserModeLinux-HOWTO.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/virtual/uml/UserModeLinux-HOWTO.txt b/Documentation/virtual/uml/UserModeLinux-HOWTO.txt index 77dfecf4e2d6..a5f8436753e7 100644 --- a/Documentation/virtual/uml/UserModeLinux-HOWTO.txt +++ b/Documentation/virtual/uml/UserModeLinux-HOWTO.txt | |||
| @@ -3591,7 +3591,7 @@ | |||
| 3591 | 3591 | ||
| 3592 | 3592 | ||
| 3593 | Looking at the source shows that the fault happened during a call to | 3593 | Looking at the source shows that the fault happened during a call to |
| 3594 | copy_to_user to copy the data into the kernel: | 3594 | copy_from_user to copy the data into the kernel: |
| 3595 | 3595 | ||
| 3596 | 3596 | ||
| 3597 | 107 count -= chars; | 3597 | 107 count -= chars; |