Merge branch 'master' of git://git.denx.de/u-boot-sparc
authorWolfgang Denk <wd@denx.de>
Wed, 27 Oct 2010 18:37:33 +0000 (20:37 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 27 Oct 2010 18:37:33 +0000 (20:37 +0200)

Trivial merge