tree f0ba7e8b50a4f103caa1c5033d30375c2d1dd5ed
parent 6ccce2b32900a8a6f481036e0cbbfe174742352c
parent fdcb23634c9b6649bb02c681033d4973491b0e35
author Linus Torvalds <torvalds@linux-foundation.org> 1320785454 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1320785454 -0800

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