Merge branch 'master' of ssh://leaflabs.com/tonka-android/boot/u-boot-linaro-stable