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)
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>
1  2 
arch/arm/mm/dma-mapping.c
drivers/of/platform.c
include/linux/device.h

Simple merge
Simple merge
Simple merge