diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-20 00:09:43 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-20 00:09:43 +0100 |
| commit | b31a3bc3dbd2f42b61674d37de7f46022e1f6846 (patch) | |
| tree | f497661f34009eff1455df8729ce750fdddad7e5 /drivers/s390/block/dasd_proc.c | |
| parent | Merge tag 'powerpc-4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/po... (diff) | |
| parent | sched/preempt, sh: kmap_coherent relies on disabled preemption (diff) | |
| download | linux-b31a3bc3dbd2f42b61674d37de7f46022e1f6846.tar.xz linux-b31a3bc3dbd2f42b61674d37de7f46022e1f6846.zip | |
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
Diffstat (limited to 'drivers/s390/block/dasd_proc.c')
0 files changed, 0 insertions, 0 deletions