Merge remote-tracking branch 'linus' into linaro-3.0