Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull core locking updates from Ingo Molnar:
 "The main changes in this cycle were:

   - reduced/streamlined smp_mb__*() interface that allows more usecases
     and makes the existing ones less buggy, especially in rarer
     architectures

   - add rwsem implementation comments

   - bump up lockdep limits"

* 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (33 commits)
  rwsem: Add comments to explain the meaning of the rwsem's count field
  lockdep: Increase static allocations
  arch: Mass conversion of smp_mb__*()
  arch,doc: Convert smp_mb__*()
  arch,xtensa: Convert smp_mb__*()
  arch,x86: Convert smp_mb__*()
  arch,tile: Convert smp_mb__*()
  arch,sparc: Convert smp_mb__*()
  arch,sh: Convert smp_mb__*()
  arch,score: Convert smp_mb__*()
  arch,s390: Convert smp_mb__*()
  arch,powerpc: Convert smp_mb__*()
  arch,parisc: Convert smp_mb__*()
  arch,openrisc: Convert smp_mb__*()
  arch,mn10300: Convert smp_mb__*()
  arch,mips: Convert smp_mb__*()
  arch,metag: Convert smp_mb__*()
  arch,m68k: Convert smp_mb__*()
  arch,m32r: Convert smp_mb__*()
  arch,ia64: Convert smp_mb__*()
  ...

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

diff --cc block/blk-iopoll.c
Simple merge

diff --cc drivers/firewire/ohci.c
Simple merge

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

diff --cc drivers/md/dm.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/gadget/tcm_usb_gadget.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 include/linux/netdevice.h
Simple merge

diff --cc include/linux/sched.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 kernel/sched/cpupri.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