]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 17 Jul 2013 01:45:27 +0000 (11:45 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 17 Jul 2013 01:45:27 +0000 (11:45 +1000)
commit2b986365a3b9d7d4e9df06dc3b3682269c0e66d3
treef9473bcf6bed1237c162081b7414a48ea55c6e73
parentd766b56c3e71bef4f28e69be5dc0709da10d4c8c
parent20f7462aac0b220c56231a15abec9ab99e897136
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

Conflicts:
mm/Kconfig
arch/arm/mm/dma-mapping.c
drivers/base/Makefile
mm/Kconfig