diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 20:52:51 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 20:52:51 +0200 |
| commit | 304f936aeaab0c3cc9d5af438fd3498ac7682991 (patch) | |
| tree | 6b50ccc855dff4717749974630d258ba786811d0 /include/asm-generic/global_data.h | |
| parent | 019b57cc1d280c3768e2e8a7ff22e07a64c2f670 (diff) | |
| parent | 5287d595449512385e25f5afcb68a130bf08bae6 (diff) | |
Merge remote-tracking branch 'u-boot-samsung/master'
Conflicts:
boards.cfg
Conflict was trivial between goni maintainer change and
lager_nor removal.
Diffstat (limited to 'include/asm-generic/global_data.h')
0 files changed, 0 insertions, 0 deletions