Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 19 Feb 2014 11:04:45 +0000 (12:04 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 19 Feb 2014 11:04:45 +0000 (12:04 +0100)
commite7538fee991308c16f76f7eca2517089f2a30ff4
tree13530e6f549f997d680eaaba087bdb32f68989b6
parent1feb6e3c9216a34885f24f0df4a02a30dfb35f19
parentda781c60e5d55904d77931fcb63f25e65e2228be
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
drivers/pci/Makefile
include/configs/nitrogen6x.h