From: Linus Torvalds Date: Tue, 24 Jul 2007 23:00:26 +0000 (-0700) 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=2f66b529d9d131971e2509aee5478c61ca258ece;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Fix marge error due to conflict in arch/mips/kernel/head.S [MIPS] ARC: Remove unused arch/mips/arc/console.c [MIPS] SNI: sniprom [MIPS] Jazz: remove unneeded reset functions [MIPS] Whitespace cleanup. [MIPS] Make resources for ds1742 "static __initdata" [MIPS] Replace __attribute_used__ with __used [MIPS] Jazz: Remove unused arch/mips/jazz/io.c [MIPS] Mark prom_free_prom_memory as __init_refok [MIPS] MIPSsim: Fix cflags --- 2f66b529d9d131971e2509aee5478c61ca258ece