Merge tag 'v3.10.60' into linux-linaro-lsk

This is the 3.10.60 stable release

diff --cc arch/x86/include/asm/kvm_host.h
Simple merge

diff --cc arch/x86/kvm/svm.c
Simple merge

diff --cc arch/x86/kvm/vmx.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc drivers/of/base.c
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc include/linux/of.h
Simple merge

diff --cc virt/kvm/iommu.c
Simple merge