Merge branch 'linux-3.4.y' of https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable

Conflicts:
	arch/arm/Kconfig
	arch/arm/include/asm/mutex.h
	arch/arm/mm/cache-v7.S
	arch/arm/mm/proc-v7.S
	drivers/acpi/processor_idle.c
	drivers/md/dm-crypt.c
	drivers/mmc/core/mmc.c
	drivers/pinctrl/pinctrl-tegra30.c
	drivers/usb/class/cdc-acm.c
	drivers/usb/host/xhci-ring.c
	drivers/usb/host/xhci.c
	fs/exec.c
	fs/proc/stat.c
	include/linux/thermal.h
	kernel/cgroup.c
	kernel/time/timekeeping.c
	kernel/workqueue.c
	mm/mmap.c