From: Linus Torvalds Date: Sat, 19 Mar 2016 23:09:43 +0000 (-0700) Subject: Merge tag 'tag-sh-for-4.6' of git://git.libc.org/linux-sh X-Git-Tag: v4.6-rc1~88 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b31a3bc3dbd2f42b61674d37de7f46022e1f6846;p=linux.git Merge tag 'tag-sh-for-4.6' of git://git.libc.org/linux-sh Pull arch/sh updates from Rich Felker: "This includes minor cleanups, a fix for a crash that likely affects all sh models with MMU, and introduction of a framework for boards described by device tree, which sets the stage for future J2 support" * tag 'tag-sh-for-4.6' of git://git.libc.org/linux-sh: sched/preempt, sh: kmap_coherent relies on disabled preemption sh: add SMP method selection to device tree pseudo-board sh: add device tree support and generic board using device tree sh: remove arch-specific localtimer and use generic one sh: make MMU-specific SMP code conditional on CONFIG_MMU sh: provide unified syscall trap compatible with all SH models sh: New gcc support sh: Disable trace for kernel uncompressing. sh: Use generic clkdev.h header --- b31a3bc3dbd2f42b61674d37de7f46022e1f6846