Merge branch 'linux-3.4.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into cm-10.1

Change-Id: I3160735fbe4d56ffeb1df3d8849f92bde8aaee72