Merge from Linux-Sunxi