]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Merge branch 'master-zc770'
authorJohn Linn <john.linn@xilinx.com>
Mon, 5 Mar 2012 05:21:02 +0000 (21:21 -0800)
committerJohn Linn <john.linn@xilinx.com>
Mon, 5 Mar 2012 05:21:02 +0000 (21:21 -0800)

Trivial merge