From: Linus Torvalds Date: Tue, 5 Dec 2006 03:23:34 +0000 (-0800) Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=91f433cacc9d1ae95ae46ce26d7bcf3a724c72d0;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Cleanup memory barriers for weakly ordered systems. [MIPS] Alchemy: Automatically enable CONFIG_RESOURCES_64BIT for PCI configs. [MIPS] Unify csum_partial.S [MIPS] SWARM: Fix a typo in #error directives [MIPS] Fix atomic.h build errors. [MIPS] Use SYSVIPC_COMPAT to fix various problems on N32 [MIPS] klconfig add missing bracket --- 91f433cacc9d1ae95ae46ce26d7bcf3a724c72d0