Merge up to Linux 3.4.47

Signed-off-by: task650 <task650@gmail.com>

Conflicts:
	arch/arm/include/asm/mutex.h
	drivers/cpufreq/cpufreq_wheatley.c

Change-Id: Ia647d5b358b8ae1eae03a6bcb8d41019b213b9f1