Merge branch '080131_artila' of git://linux-arm.org/u-boot-armdev