diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 20:39:21 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 20:39:21 +0100 |
| commit | 2101dd64b304b034862f5ca40877c41b7ccb9c5e (patch) | |
| tree | d56d79a33dfdc2b26c2d6e08368b0da380ee271b /arch/s390/include/asm/vdso.h | |
| parent | Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | m68k: add Sysam stmark2 open board support (diff) | |
| download | linux-2101dd64b304b034862f5ca40877c41b7ccb9c5e.tar.xz linux-2101dd64b304b034862f5ca40877c41b7ccb9c5e.zip | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68k updates from Greg Ungerer:
"The bulk of the changes are to support the ColdFire 5441x SoC family
with their MMU enabled. The parts have been supported for a long time
now, but only in no-MMU mode.
Angelo Dureghello has a new board with a 5441x and we have ironed out
the last problems with MMU enabled on it. So there is also some
changes to properly support that board too.
Also a fix for a link problem when selecting the traditional 68k beep
device in no-MMU configurations"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: add Sysam stmark2 open board support
m68k: coldfire: add dspi0 module support
m68k: pull mach_beep in setup.c
m68k: allow ColdFire m5441x parts to run with MMU enabled
m68k: fix ColdFire node shift size calculation
m68k: move coldfire MMU initialization code
Diffstat (limited to 'arch/s390/include/asm/vdso.h')
0 files changed, 0 insertions, 0 deletions