Merge remote-tracking branch 'origin/next' into kvm-ppc-next
authorAlexander Graf <agraf@suse.de>
Wed, 28 Aug 2013 22:41:59 +0000 (00:41 +0200)
committerAlexander Graf <agraf@suse.de>
Wed, 28 Aug 2013 22:41:59 +0000 (00:41 +0200)
commitbf550fc93d9855872a95e69e4002256110d89858
tree10876bb4304bffe54c4160a132e7b8de6577ac4e
parent7e48c101e0c53e6095c5f4f5e63d14df50aae8fc
parentcc2df20c7c4ce594c3e17e9cc260c330646012c8
Merge remote-tracking branch 'origin/next' into kvm-ppc-next

Conflicts:
mm/Kconfig

CMA DMA split and ZSWAP introduction were conflicting, fix up manually.
arch/arm/mm/dma-mapping.c
arch/powerpc/include/asm/kvm_book3s_64.h
arch/powerpc/kernel/asm-offsets.c
arch/powerpc/kernel/setup_64.c
arch/powerpc/kvm/book3s_64_mmu_hv.c
arch/powerpc/kvm/book3s_hv_rm_mmu.c
arch/powerpc/kvm/powerpc.c
drivers/base/Makefile
mm/Kconfig