13acfd5715
Merging master into next to satisfy the dependencies. Conflicts: arch/arm/kvm/reset.c
Merging master into next to satisfy the dependencies. Conflicts: arch/arm/kvm/reset.c