Merge branch 'cm-11.0' of github.com:CyanogenMod/android_kernel_htc_msm8960 into Torched

Conflicts:
	Makefile
	arch/arm/include/asm/mutex.h
	arch/arm/kernel/traps.c
	arch/powerpc/kernel/vio.c
	drivers/ata/libata-core.c
	drivers/block/xen-blkback/blkback.c
	drivers/mmc/host/sdhci.c
	drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
	drivers/usb/host/xhci.h
	fs/ext4/xattr.c
	kernel/cgroup.c
	kernel/trace/ftrace.c