]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 03:24:14 +0000 (13:24 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 03:24:14 +0000 (13:24 +1000)
commitf5725856791d2297ad8cda1e680c5ea7166db312
tree77701d209227c59f94ddc91f65f0efbb18397f01
parente3aaa384b05dbc710d11348cf3bda8c280018e0a
parent20f7462aac0b220c56231a15abec9ab99e897136
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

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