Marcelo Tosatti 19bf7f8ac3 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 <mtosatti@redhat.com>		2012-10-29 19:15:32 -02:00
..
asm	Merge remote-tracking branch 'master' into queue	2012-10-29 19:15:32 -02:00
uapi/asm	Merge remote-tracking branch 'master' into queue	2012-10-29 19:15:32 -02:00