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)
commitedb581110d04c70a4be5723ff8862a0f523657dd
treea2f6e2a95b2c9fc8e64909ee0db74b39cd61f4a4
parent291b63c86aea8a571ddf913d41ab5156b8314dad
parent178a29600340bef5b13cd4157053679debe35351
Merge git://git./linux/kernel/git/davem/sparc

* 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