Merge commit 'origin/queue' into for-queue

Conflicts:
	arch/powerpc/include/asm/Kbuild
	arch/powerpc/include/uapi/asm/Kbuild
This commit is contained in:
Alexander Graf 2012-10-31 13:36:18 +01:00
commit 0588000eac
7494 changed files with 282957 additions and 144396 deletions

View file

@ -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;