Merge branch 'linux-3.4.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into aosp-jb-mr2

Conflicts:
	kernel/workqueue.c

Change-Id: If841be37d15a61b4ae17029b99165b3415fd34f2