Merge branch 'next' of git://git.denx.de/u-boot-pxa into next
authorWolfgang Denk <wd@denx.de>
Thu, 17 Jun 2010 20:39:03 +0000 (22:39 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 17 Jun 2010 20:39:03 +0000 (22:39 +0200)

Trivial merge