Merge branch 'linux-3.4.10' into cm-10.1