From: Linus Torvalds 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: firefly_0821_release~3680^2~4638 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=edb581110d04c70a4be5723ff8862a0f523657dd;p=firefly-linux-kernel-4.4.55.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