Merge branch 'asm-generic' of git://git.denx.de/u-boot-microblaze