Merge tag 'tegra-for-3.18-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarr...
authorArnd Bergmann <arnd@arndb.de>
Thu, 25 Sep 2014 15:53:39 +0000 (17:53 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 25 Sep 2014 15:53:39 +0000 (17:53 +0200)
commit14b62fb0159a77989708370ca8c8ba5db55c1dab
treeebac8083a32c738074797e0a6ae50e5ffe41eb83
parente36087998a3b01f3c6c93fa9465e40103f427315
parentd37aba521379203b740a2929e6e6f6bd2485f5d7
Merge tag 'tegra-for-3.18-soc' of git://git./linux/kernel/git/swarren/linux-tegra into next/soc

Pull "ARM: tegra: core SoC code changes for 3.18" from Stephen Warren:

the primary change here gets its address information from DT rather than
iomap.h. This removes one more user of iomap.h, and will help allow the
code to move to a location that can be shared between arch/arm and
arch/arm64.

An unused header file was also removed.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'tegra-for-3.18-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: tegra: remove unused tegra_emc.h
  ARM: tegra: Initialize flow controller from DT
  of: Add NVIDIA Tegra flow controller bindings