diff options
author | Stefano Babic <sbabic@denx.de> | 2013-09-13 12:04:54 +0200 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2013-09-13 12:10:07 +0200 |
commit | c4a7ece02046f647019cc0aaddf530833a8db29c (patch) | |
tree | 06342cd9b8cc41b95442a992fb38a1bc8671b05c /include/configs/actux1.h | |
parent | b5e7f1bc4b899ea34e838d5d60b3e6f8e479d0a9 (diff) | |
parent | 8386ca8bea7a6a8469c3b6a99313afb642e6cbeb (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
MAINTAINERS
boards.cfg
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'include/configs/actux1.h')
0 files changed, 0 insertions, 0 deletions