]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'keystone/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 May 2014 00:47:36 +0000 (10:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 May 2014 00:47:36 +0000 (10:47 +1000)
1  2 
arch/arm/configs/sunxi_defconfig
arch/arm/mm/dma-mapping.c
drivers/of/platform.c
include/linux/device.h

Simple merge
Simple merge
Simple merge
Simple merge