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)
commitc8f17084fe0fa7fdb5ff21eab9ccce49439ebdb1
treef0ba7e8b50a4f103caa1c5033d30375c2d1dd5ed
parent6ccce2b32900a8a6f481036e0cbbfe174742352c
parentfdcb23634c9b6649bb02c681033d4973491b0e35
Merge branch 'fixes' of git://git./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