]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Merge branch 'master-zc770' of /home/linnj/sivlinnj/u-boot-xarm into master-zc770
authorGIT Repo <git@xsjlinnj40.(none)>
Tue, 17 Jan 2012 22:15:49 +0000 (14:15 -0800)
committerGIT Repo <git@xsjlinnj40.(none)>
Tue, 17 Jan 2012 22:15:49 +0000 (14:15 -0800)

Trivial merge