Merge tag 'armsoc-cleanup' into test-merge
authorKevin Hilman <khilman@linaro.org>
Thu, 25 Jun 2015 04:32:10 +0000 (21:32 -0700)
committerKevin Hilman <khilman@linaro.org>
Thu, 25 Jun 2015 04:32:10 +0000 (21:32 -0700)
ARM: SoC cleanups for v4.2

A relatively small setup of cleanups this time around, and similar to last time
the bulk of it is removal of legacy board support:

- OMAP: removal of legacy (non-DT) booting for several platforms
- i.MX: remove some legacy board files

Conflicts: None

# gpg: Signature made Wed Jun 24 21:32:09 2015 PDT using RSA key ID D3FBC665
# gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>"
# gpg:                 aka "Kevin Hilman <khilman@linaro.org>"
# gpg:                 aka "Kevin Hilman <khilman@kernel.org>"

1  2 
arch/arm/boot/dts/tegra124.dtsi
arch/arm/mach-imx/gpc.c
drivers/ata/Kconfig

Simple merge
Simple merge
Simple merge