Merge remote-tracking branch 'linux/master' into kvmarm-master/master