Merge tag 'hwspinlock-3.6-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Sep 2012 18:58:54 +0000 (11:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Sep 2012 18:58:54 +0000 (11:58 -0700)
Pull hwspinlock fix from Ohad Ben-Cohen:
 "A single hwspinlock fix by Wei Yongjun, which prevents potential NULL
  dereferences"

* tag 'hwspinlock-3.6-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock:
  hwspinlock/core: move the dereference below the NULL test


Trivial merge