Merge branch 'for-upstream' of git://git.denx.de/u-boot-atmel