Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.040.315' of git://codeaurora.org/kernel/msm into cm-10.1

Conflicts:
	drivers/media/video/videobuf2-msm-mem.c
	drivers/mmc/core/core.h
	include/linux/mmc/host.h
	kernel/signal.c

Change-Id: Ie4314058c01f0bead5318a4124a1c7fdcaf534db

Conflicts:
	drivers/media/video/videobuf2-msm-mem.c