Merge branch 'locking/core'

diff --cc arch/metag/include/asm/barrier.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_irq.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
Simple merge

diff --cc drivers/net/ethernet/freescale/gianfar.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/target/target_core_device.c
Simple merge

diff --cc drivers/target/target_core_transport.c
Simple merge

diff --cc drivers/tty/n_tty.c
Simple merge

diff --cc drivers/usb/serial/usb_wwan.c
Simple merge

diff --cc fs/btrfs/ioctl.c
Simple merge

diff --cc include/linux/interrupt.h
Simple merge

diff --cc kernel/futex.c
Simple merge

diff --cc kernel/rcu/tree.c
Simple merge

diff --cc kernel/rcu/tree_plugin.h
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc mm/filemap.c
Simple merge

diff --cc net/bluetooth/hci_event.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/ipv4/tcp_output.c
Simple merge