Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Nov 2011 20:50:54 +0000 (12:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Nov 2011 20:50:54 +0000 (12:50 -0800)
* '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


Trivial merge