projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 787c57c 35fd3dc)
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)
commit19bf7f8ac3f8131100027281c495dbbe00cd5ae0
tree270b97e3ca47c0f62a1babca2ae37f79a76a309ctree | snapshot
parent787c57c0fb393fe8a3974d300ddcfe30373386fecommit | diff
parent35fd3dc58da675d659513384221349ef90749a01commit | diff
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 diff1 | diff2 | blob | history
arch/powerpc/include/asm/epapr_hcalls.h blob1 | blob2 | history
arch/powerpc/include/asm/kvm_book3s.h diff1 | diff2 | blob | history
arch/powerpc/include/asm/kvm_para.h diff1 | diff2 | blob | history
arch/powerpc/include/uapi/asm/Kbuild diff1 | diff2 | blob | history
arch/powerpc/include/uapi/asm/epapr_hcalls.h | | blob
arch/powerpc/include/uapi/asm/kvm.h | diff2 | blob | history
arch/powerpc/include/uapi/asm/kvm_para.h | diff2 | blob | history
arch/powerpc/kernel/ppc_ksyms.c diff1 | diff2 | blob | history
arch/powerpc/kvm/book3s_32_mmu_host.c diff1 | diff2 | blob | history
arch/powerpc/kvm/book3s_64_mmu_host.c diff1 | diff2 | blob | history
arch/powerpc/kvm/book3s_hv.c diff1 | diff2 | blob | history
arch/powerpc/kvm/trace.h diff1 | diff2 | blob | history
arch/x86/kvm/mmu.c diff1 | diff2 | blob | history
include/uapi/linux/kvm.h | diff2 | blob | history
John Crispins staging tree