.config and defconfig changes
Merge remote-tracking branch 'origin/sunxi-3.0' into sunxi-3.0