Merge remote-tracking branch 'caf/jb_2.5' into desting-korg
korg 3.4.15

Merge commit '553f672df76c6213b9a7e644b1d878204a61e013' into desting-korg

Conflicts:
	arch/arm/Kconfig
	arch/arm/include/asm/mutex.h
	arch/arm/kernel/traps.c
	arch/arm/mm/mmu.c
	arch/arm/mm/tlb-v7.S
	arch/arm/vfp/entry.S
	arch/arm/vfp/vfpmodule.c
	drivers/base/power/main.c
	drivers/bluetooth/btusb.c
	drivers/mmc/card/block.c
	drivers/mmc/host/sdhci.c
	drivers/net/tun.c
	drivers/usb/core/hub.c
	drivers/usb/host/xhci.h
	include/linux/sched.h
	kernel/power/suspend.c
	net/bluetooth/hci_conn.c
	net/bluetooth/hci_event.c
	net/bluetooth/l2cap_core.c
	net/bluetooth/mgmt.c
	net/bluetooth/smp.c