# Unmerged paths:
#   (use "git add <file>..." to mark resolution)
#
#	both modified:      arch/arm/Kconfig
#	both modified:      arch/arm/include/asm/mutex.h
#	both modified:      arch/arm/kernel/traps.c
#	both modified:      arch/arm/mm/dma-mapping.c
#	both modified:      arch/arm/mm/tlb-v7.S
#	both modified:      arch/arm/vfp/vfpmodule.c
#	both modified:      drivers/base/power/main.c
#	both modified:      drivers/bluetooth/ath3k.c
#	both modified:      drivers/bluetooth/btusb.c
#	both modified:      drivers/gpu/drm/radeon/radeon_mode.h
#	both modified:      drivers/mmc/card/block.c
#	both modified:      drivers/mmc/host/sdhci.c
#	both modified:      drivers/net/tun.c
#	both modified:      drivers/usb/core/hub.c
#	both modified:      drivers/usb/core/message.c
#	both modified:      drivers/usb/host/xhci.h
#	both modified:      fs/ubifs/dir.c
#	both modified:      include/linux/freezer.h
#	both modified:      include/linux/sched.h
#	both modified:      include/net/bluetooth/hci_core.h
#	both modified:      include/net/bluetooth/mgmt.h
#	both modified:      kernel/cgroup.c
#	both modified:      kernel/futex.c
#	both modified:      kernel/power/suspend.c
#	both modified:      kernel/signal.c
#	both modified:      mm/madvise.c
#	both modified:      net/bluetooth/hci_conn.c
#	both modified:      net/bluetooth/hci_core.c
#	both modified:      net/bluetooth/hci_event.c
#	both modified:      net/bluetooth/l2cap_core.c
#	both modified:      net/bluetooth/mgmt.c
#	both modified:      net/bluetooth/rfcomm/sock.c
#	both modified:      net/bluetooth/smp.c