projects / oweals / u-boot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e7538fe 0a8e823)
Merge branch 'u-boot/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 20 Feb 2014 12:16:05 +0000 (13:16 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 20 Feb 2014 12:16:05 +0000 (13:16 +0100)
commit3e11350255d9c5d4bd03c2a65769da84c05d3294
tree2ebc3d0fa0592479020d2d9dc7228b4d15ed2eaatree | snapshot
parente7538fee991308c16f76f7eca2517089f2a30ff4commit | diff
parent0a8e823ad0c5a602c93c2e8a54caf622ade6d3fbcommit | diff
Merge branch 'u-boot/master' into 'u-boot-arm/master'

Conflicts:
Makefile
drivers/net/npe/Makefile

These two conflicts arise from commit 0b2d3f20
("ARM: NET: Remove the IXP NPE ethernet driver") and are
resolved by deleting the drivers/net/npe/Makefile file
and removing the CONFIG_IXP4XX_NPE line from Makefile.
MAKEALL diff1 | diff2 | blob | history
Makefile diff1 | diff2 | blob | history
README diff1 | diff2 | blob | history
include/common.h diff1 | diff2 | blob | history
include/configs/hummingboard.h diff1 | diff2 | blob | history
include/configs/udoo.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.