]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot
authorKim Phillips <kim.phillips@freescale.com>
Fri, 25 Jan 2013 17:22:16 +0000 (11:22 -0600)
committerKim Phillips <kim.phillips@freescale.com>
Fri, 25 Jan 2013 17:22:16 +0000 (11:22 -0600)

Trivial merge