| commit | 1f493d95d5986bfff4e82df7701b96371ed415f5 | [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 | abf8322da7e00dbc1f555ac8ba5cb581dd625f3f [diff] | |
| parent | d3d17fcb240278dddfeb5bae56f9dafa9b976f2b [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.