Merge git://www.denx.de/git/u-boot-marvell
authorTom Rini <trini@konsulko.com>
Thu, 14 Jan 2016 16:23:05 +0000 (11:23 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 14 Jan 2016 16:23:05 +0000 (11:23 -0500)
commitf46c25583a73042edf432b209ee4b93bc3f7e762
treea7cbd8afde1b0cbf86a9c8150cbd737df3ee82c9
parentdb18f548cb7b5ff99223b66eac1966eb45230817
parentf822d8578ba395d9af1cc315a2fb87b1eed3d355
Merge git://www.denx.de/git/u-boot-marvell

Conflicts:
arch/arm/Kconfig

Signed-off-by: Tom Rini <trini@konsulko.com>
arch/arm/Kconfig