diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-03-25 09:25:14 (GMT) |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-03-25 09:53:15 (GMT) |
| commit | ab6423cae0323e8db2c8fdd0a99138d93fde2137 (patch) | |
| tree | a97493753a119e577161a4fb0b40b8edfc3923bb /include/configs/bur_am335x_common.h | |
| parent | 63f347ec4ca94e3b57c6c719e4acaec81b61dc7a (diff) | |
| parent | 2c072c958bb544c72f0e848375803dbd6971f022 (diff) | |
| download | u-boot-fsl-qoriq-ab6423cae0323e8db2c8fdd0a99138d93fde2137.tar.xz | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Trivial merge conflict, needed to manually remove
local_info as per commit 41364f0f.
Conflicts:
board/samsung/common/board.c
Diffstat (limited to 'include/configs/bur_am335x_common.h')
0 files changed, 0 insertions, 0 deletions