From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 16 Aug 2011 02:16:01 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: v3.1~298
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=edb581110d04c70a4be5723ff8862a0f523657dd;p=platform%2Fkernel%2Flinux-amlogic.git

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
---

edb581110d04c70a4be5723ff8862a0f523657dd