Merged other arch from linux 3.4.77!
Merging with Linux 3.4.78