Merge remote-tracking branch 'f2fs-backport/merge' into cm-11.0

Conflicts:
	arch/arm/include/asm/hwcap.h
	arch/arm/include/asm/tls.h
	arch/arm/kernel/smp.c
	arch/arm/kernel/traps.c
	drivers/bluetooth/btusb.c
	drivers/hid/hid-multitouch.c
	drivers/md/dm-crypt.c
	drivers/net/Kconfig
	drivers/net/tun.c
	drivers/tty/serial/serial_core.c
	fs/namespace.c
	include/linux/wait.h
	lib/genalloc.c
	mm/memory_hotplug.c
	mm/page_alloc.c
	mm/vmalloc.c
	net/bluetooth/l2cap_core.c
	security/commoncap.c
	sound/soc/soc-dapm.c

Change-Id: If3f644964686b7b278869b78c057e938cb058044