Linux 3.4.40: Merge branch 'linux-3.4.y' into jb-mr1

Change-Id: I128fddd597faf0a0c92623b0927ec61cbf6f6efb