]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
Merge git://git.denx.de/u-boot-marvell
authorTom Rini <trini@konsulko.com>
Tue, 5 May 2015 14:32:08 +0000 (10:32 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 5 May 2015 14:32:08 +0000 (10:32 -0400)
1  2 
arch/arm/Kconfig

Simple merge