summaryrefslogtreecommitdiff
path: root/snapshot.commit
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2013-09-13 12:04:54 +0200
committerStefano Babic <sbabic@denx.de>2013-09-13 12:10:07 +0200
commitc4a7ece02046f647019cc0aaddf530833a8db29c (patch)
tree06342cd9b8cc41b95442a992fb38a1bc8671b05c /snapshot.commit
parentb5e7f1bc4b899ea34e838d5d60b3e6f8e479d0a9 (diff)
parent8386ca8bea7a6a8469c3b6a99313afb642e6cbeb (diff)
downloadu-boot-imx-c4a7ece02046f647019cc0aaddf530833a8db29c.zip
u-boot-imx-c4a7ece02046f647019cc0aaddf530833a8db29c.tar.gz
u-boot-imx-c4a7ece02046f647019cc0aaddf530833a8db29c.tar.bz2
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 'snapshot.commit')
0 files changed, 0 insertions, 0 deletions