Merge branch 'cm-11.0' into HEAD

Conflicts:
	Makefile
	drivers/infiniband/hw/qib/qib_user_sdma.c
	drivers/input/mouse/synaptics.c
	drivers/target/target_core_file.c
	kernel/power/swap.c
	kernel/sched/core.c