| commit | 3e11350255d9c5d4bd03c2a65769da84c05d3294 | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Thu Feb 20 13:16:05 2014 +0100 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Thu Feb 20 13:16:05 2014 +0100 |
| tree | 2ebc3d0fa0592479020d2d9dc7228b4d15ed2eaa | |
| parent | e7538fee991308c16f76f7eca2517089f2a30ff4 [diff] | |
| parent | 0a8e823ad0c5a602c93c2e8a54caf622ade6d3fb [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.