From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Jul 2012 20:22:40 +0000 (-0700)
Subject: Merge tag 'hwspinlock-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~3680^2~2501
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=17cda2082db413355a12bfeb1d1e98308ab0d095;p=firefly-linux-kernel-4.4.55.git

Merge tag 'hwspinlock-3.5-fixes' of git://git./linux/kernel/git/ohad/hwspinlock

Pull hwspinlock fix from Ohad Ben-Cohen:
 "A single hwspinlock core fix for multiple hwspinlock devices
  scenarios, from Shinya Kuribayashi."

* tag 'hwspinlock-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock:
  hwspinlock/core: use global ID to register hwspinlocks on multiple devices
---

17cda2082db413355a12bfeb1d1e98308ab0d095