summaryrefslogtreecommitdiffstats
path: root/drivers/memory/atmel-sdramc.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-04-26 19:29:46 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2018-04-26 19:29:46 +0200
commit1334ac11d93167fcc2953e9dd71837459b97d610 (patch)
tree84f8e91ca726a90a0461c86a8830ac4e0c23ae11 /drivers/memory/atmel-sdramc.c
parentMerge tag 'for_v4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ja... (diff)
parents390: correct module section names for expoline code revert (diff)
downloadlinux-1334ac11d93167fcc2953e9dd71837459b97d610.tar.xz
linux-1334ac11d93167fcc2953e9dd71837459b97d610.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky: "A couple of bug fixes: - correct some CPU-MF counter names for z13 and z14 - correct locking in the vfio-ccw fsm_io_helper function - provide arch_uretprobe_is_alive to avoid sigsegv with uretprobes - fix a corner case with CPU-MF sampling in regard to execve - fix expoline code revert for loadable modules - update chpid descriptor for resource accessibility events - fix dasd I/O errors due to outdated device alias infomation" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390: correct module section names for expoline code revert vfio: ccw: process ssch with interrupts disabled s390: update sampling tag after task pid change s390/cpum_cf: rename IBM z13/z14 counter names s390/dasd: fix IO error for newly defined devices s390/uprobes: implement arch_uretprobe_is_alive() s390/cio: update chpid descriptor after resource accessibility event
Diffstat (limited to 'drivers/memory/atmel-sdramc.c')
0 files changed, 0 insertions, 0 deletions