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: I5e25dbdd5b7a023ee7700ac87887df8b2e31268c