Merge remote-tracking branch 'master' into queue

Merge reason: development work has dependency on kvm patches merged
upstream.

Conflicts:
	arch/powerpc/include/asm/Kbuild
	arch/powerpc/include/asm/kvm_para.h

Signed-off-by: Marcelo Tosatti <[email protected]>
This commit is contained in:
Marcelo Tosatti 2012-10-29 19:15:32 -02:00
commit 19bf7f8ac3
7487 changed files with 282508 additions and 143859 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;