]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'master' into queue
authorMarcelo Tosatti <mtosatti@redhat.com>
Mon, 29 Oct 2012 21:15:32 +0000 (19:15 -0200)
committerMarcelo Tosatti <mtosatti@redhat.com>
Mon, 29 Oct 2012 21:15:32 +0000 (19:15 -0200)
commita8277e333d0fe6784be84fd836e0e3f2ce180512
tree270b97e3ca47c0f62a1babca2ae37f79a76a309c
parent7d0c03c4ee3032a8657dd1bb524fbfce011fd2eb
parent4cf2f3761eba40267ceb90382e4fc3c9539e5a8d
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>
15 files changed:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/asm/epapr_hcalls.h
arch/powerpc/include/asm/kvm_book3s.h
arch/powerpc/include/asm/kvm_para.h
arch/powerpc/include/uapi/asm/Kbuild
arch/powerpc/include/uapi/asm/epapr_hcalls.h
arch/powerpc/include/uapi/asm/kvm.h
arch/powerpc/include/uapi/asm/kvm_para.h
arch/powerpc/kernel/ppc_ksyms.c
arch/powerpc/kvm/book3s_32_mmu_host.c
arch/powerpc/kvm/book3s_64_mmu_host.c
arch/powerpc/kvm/book3s_hv.c
arch/powerpc/kvm/trace.h
arch/x86/kvm/mmu.c
include/uapi/linux/kvm.h