Merge commit 'origin/queue' into for-queue

Conflicts: arch/powerpc/include/asm/Kbuild arch/powerpc/include/uapi/asm/Kbuild
2012-10-31 13:36:18 +01:00
parent 8b5869ad85 81c52c56e2
commit 0588000eac
7494 changed files with 281730 additions and 143169 deletions
@@ -3591,7 +3591,7 @@


  Looking at the source shows that the fault happened during a call to
-  copy_to_user to copy the data into the kernel:
+  copy_from_user to copy the data into the kernel:


       107             count -= chars;