Merge branch '070524_netstar' of git://linux-arm.org/u-boot-armdev