diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-11 09:59:27 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-11 09:59:27 +0200 |
| commit | 5480ac32171ab0e38c48c9f585fa650c7867f6a1 (patch) | |
| tree | 6672a47e3675e7e79fd0fbf9b491045230b24eed /.gitignore | |
| parent | 68e1747f9c0506159e8ecc9a4feb58e9c65a7b39 (diff) | |
| parent | 5c18a1cf3e56e0177388258696be4a17a672e9d0 (diff) | |
| download | blackbird-obmc-uboot-5480ac32171ab0e38c48c9f585fa650c7867f6a1.tar.gz blackbird-obmc-uboot-5480ac32171ab0e38c48c9f585fa650c7867f6a1.zip | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Conflicts:
tools/Makefile
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions
