Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] zcrypt: fix scheduling of hrtimer ap_poll_timer [S390] vdso: clock_gettime of CLOCK_THREAD_CPUTIME_ID with noexec=on [S390] vdso: fix per cpu area allocation [S390] hibernation: fix register corruption on machine checks [S390] hibernation: fix lowcore handling
Showing
- arch/s390/kernel/early.c 2 additions, 2 deletionsarch/s390/kernel/early.c
- arch/s390/kernel/smp.c 4 additions, 3 deletionsarch/s390/kernel/smp.c
- arch/s390/kernel/vdso64/clock_gettime.S 9 additions, 2 deletionsarch/s390/kernel/vdso64/clock_gettime.S
- arch/s390/power/swsusp.c 24 additions, 12 deletionsarch/s390/power/swsusp.c
- arch/s390/power/swsusp_asm64.S 9 additions, 26 deletionsarch/s390/power/swsusp_asm64.S
- drivers/s390/crypto/ap_bus.c 7 additions, 2 deletionsdrivers/s390/crypto/ap_bus.c
Loading
Please register or sign in to comment