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: Iaddffa713a040ca9d1b8a80ed5270fa3ab7af9fd
Signed-off-by: task650 <task650@gmail.com>

Conflicts:
	arch/arm/include/asm/mutex.h
	drivers/char/random.c
	kernel/sched/core.c