Merge tag 'aspeed-for-4.7-defconfig' of https://github.com/shenki/linux into next...