Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Sep 2016 19:41:19 +0000 (12:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Sep 2016 19:41:19 +0000 (12:41 -0700)
commit2507c856620cc7474e6101b0a05f82ac0ae5bf69
treea7bdba4229890416e1e5fe50fa9052a7bdb122d1
parent709b8f67d72078cbbd166aaecd2d0f48d1d1560c
parent96b03ab86d843524ec4aed7fe0ceef412c684c68
Merge branch 'locking-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull locking fixes from Thomas Gleixner:
 "Two smallish fixes:

   - use the proper asm constraint in the Super-H atomic_fetch_ops

   - a trivial typo fix in the Kconfig help text"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/hung_task: Fix typo in CONFIG_DETECT_HUNG_TASK help text
  locking/atomic, arch/sh: Fix ATOMIC_FETCH_OP()