Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Aug 2011 02:16:01 +0000 (19:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Aug 2011 02:16:01 +0000 (19:16 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Set HAVE_C_RECORDMCOUNT
  sparc32: unbreak arch_write_unlock()
  sparc64: remove unnecessary macros from spinlock_64.h


Trivial merge