]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'depends/dma-ranges' into next/soc
authorArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 16:48:05 +0000 (18:48 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 19:57:52 +0000 (21:57 +0200)
commita36d82e9d3c92f692c7ad68b72b4c1ea87905090
tree6e18e218aa21c41fe336c38af0562560a447207c
parent3c2580173e3bc820a8f8c0db968f757b8eca7fe5
parent597537730bfc24f61189bac197884d50e1e42248
Merge branch 'depends/dma-ranges' into next/soc

This branch has been picked up by rmk to be merged through his tree,
and is required as a base for the keystone changes.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mm/dma-mapping.c
drivers/of/platform.c
include/linux/device.h