]> git.ipfire.org Git - people/ms/u-boot.git/commit - dts/Kconfig
Merge branch 'u-boot/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 5 May 2015 08:09:06 +0000 (10:09 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 5 May 2015 08:09:06 +0000 (10:09 +0200)
commitb939689c7b87773c44275a578ffc8674a867e39d
tree785d71eb0bbc707385e4456a14b21706223d99a3
parent97840b5d1fe0960134c3553a9d9d1c1cd1be784d
parentace97d26176a3ebc9ec07738450de93eea35975c
Merge branch 'u-boot/master' into 'u-boot-arm/master'
include/configs/zynq-common.h