Commits
Merge branch 'master' into upstream. This is sync with Linus' tree to receive KEY_IMAGES definition that went in through input tree.
Merge branch 'master' into upstream. This is sync with Linus' tree to receive KEY_IMAGES definition that went in through input tree.