From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 Nov 2011 20:50:54 +0000 (-0800)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock
X-Git-Tag: v3.2-rc2~33
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c8f17084fe0fa7fdb5ff21eab9ccce49439ebdb1;p=~emulex%2Finfiniband.git

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock:
  hwspinlock/u8500: fix build error due to undefined label
  hwspinlock: Don't return a value in __hwspin_unlock
---

c8f17084fe0fa7fdb5ff21eab9ccce49439ebdb1