Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (37 commits) [S390] Avoid excessive inlining. [S390] Mark kernel text section read-only. [S390] Convert memory detection into C code. [S390] Calibrate delay and bogomips. [S390] Hypervisor filesystem (s390_hypfs) for z/VM [S390] Add crypto support for 3592 tape devices [S390] boot from NSS support [S390] Support for s390 Pseudo Random Number Generator [S390] ETR support. [S390] noexec protection [S390] move crypto options and some cleanup. [S390] cio: Don't spam debug feature. [S390] Cleanup of CHSC event handling. [S390] cio: declare hardware structures packed. [S390] Add set_fs(USER_DS) to start_thread(). [S390] cio: Catch operand exceptions on stsch. [S390] Fix register usage description. [S390] kretprobe_trampoline_holder() in wrong section. [S390] Fix kprobes breakpoint handling. [S390] Update maintainers file. ...
Showing
- Documentation/s390/Debugging390.txt 1 addition, 1 deletionDocumentation/s390/Debugging390.txt
- MAINTAINERS 3 additions, 3 deletionsMAINTAINERS
- arch/s390/Kconfig 25 additions, 4 deletionsarch/s390/Kconfig
- arch/s390/appldata/appldata_base.c 1 addition, 1 deletionarch/s390/appldata/appldata_base.c
- arch/s390/appldata/appldata_mem.c 1 addition, 1 deletionarch/s390/appldata/appldata_mem.c
- arch/s390/appldata/appldata_net_sum.c 1 addition, 1 deletionarch/s390/appldata/appldata_net_sum.c
- arch/s390/crypto/Kconfig 60 additions, 0 deletionsarch/s390/crypto/Kconfig
- arch/s390/crypto/Makefile 1 addition, 2 deletionsarch/s390/crypto/Makefile
- arch/s390/crypto/aes_s390.c 23 additions, 24 deletionsarch/s390/crypto/aes_s390.c
- arch/s390/crypto/crypt_s390.h 139 additions, 142 deletionsarch/s390/crypto/crypt_s390.h
- arch/s390/crypto/crypt_s390_query.c 0 additions, 129 deletionsarch/s390/crypto/crypt_s390_query.c
- arch/s390/crypto/des_check_key.c 4 additions, 2 deletionsarch/s390/crypto/des_check_key.c
- arch/s390/crypto/des_s390.c 4 additions, 4 deletionsarch/s390/crypto/des_s390.c
- arch/s390/crypto/prng.c 213 additions, 0 deletionsarch/s390/crypto/prng.c
- arch/s390/crypto/sha1_s390.c 37 additions, 46 deletionsarch/s390/crypto/sha1_s390.c
- arch/s390/crypto/sha256_s390.c 3 additions, 8 deletionsarch/s390/crypto/sha256_s390.c
- arch/s390/defconfig 7 additions, 5 deletionsarch/s390/defconfig
- arch/s390/hypfs/Makefile 1 addition, 1 deletionarch/s390/hypfs/Makefile
- arch/s390/hypfs/hypfs.h 9 additions, 0 deletionsarch/s390/hypfs/hypfs.h
- arch/s390/hypfs/hypfs_diag.h 0 additions, 16 deletionsarch/s390/hypfs/hypfs_diag.h
Loading
Please register or sign in to comment