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: (34 commits) [S390] Don't use small stacks when lockdep is used. [S390] cio: Use device_reprobe() instead of bus_rescan_devices(). [S390] cio: Retry internal operations after vary off. [S390] cio: Use path verification for last path gone after vary off. [S390] non-unique constant/macro identifiers. [S390] Memory detection fixes. [S390] cio: Make ccw_dev_id_is_equal() more robust. [S390] Convert extmem spin_lock into a mutex. [S390] set KBUILD_IMAGE. [S390] lockdep: show held locks when showing a stackdump [S390] Add dynamic size check for usercopy functions. [S390] Use diag260 for memory size detection. [S390] pfault code cleanup. [S390] Cleanup memory_chunk array usage. [S390] Misaligned wait PSW at memory detection. [S390] cpu shutdown rework [S390] cpcmd <-> __cpcmd calling issues [S390] Bad kexec control page allocation. [S390] Reset infrastructure for re-IPL. [S390] Some documentation typos. ...
Showing
- Documentation/s390/CommonIO 2 additions, 2 deletionsDocumentation/s390/CommonIO
- Documentation/s390/Debugging390.txt 19 additions, 19 deletionsDocumentation/s390/Debugging390.txt
- Documentation/s390/cds.txt 6 additions, 6 deletionsDocumentation/s390/cds.txt
- Documentation/s390/crypto/crypto-API.txt 3 additions, 3 deletionsDocumentation/s390/crypto/crypto-API.txt
- Documentation/s390/s390dbf.txt 4 additions, 4 deletionsDocumentation/s390/s390dbf.txt
- arch/s390/Kconfig 1 addition, 4 deletionsarch/s390/Kconfig
- arch/s390/Makefile 3 additions, 0 deletionsarch/s390/Makefile
- arch/s390/kernel/Makefile 1 addition, 1 deletionarch/s390/kernel/Makefile
- arch/s390/kernel/cpcmd.c 11 additions, 7 deletionsarch/s390/kernel/cpcmd.c
- arch/s390/kernel/head.S 0 additions, 21 deletionsarch/s390/kernel/head.S
- arch/s390/kernel/head31.S 3 additions, 5 deletionsarch/s390/kernel/head31.S
- arch/s390/kernel/head64.S 13 additions, 4 deletionsarch/s390/kernel/head64.S
- arch/s390/kernel/ipl.c 156 additions, 29 deletionsarch/s390/kernel/ipl.c
- arch/s390/kernel/machine_kexec.c 18 additions, 60 deletionsarch/s390/kernel/machine_kexec.c
- arch/s390/kernel/reipl.S 2 additions, 15 deletionsarch/s390/kernel/reipl.S
- arch/s390/kernel/reipl64.S 5 additions, 11 deletionsarch/s390/kernel/reipl64.S
- arch/s390/kernel/relocate_kernel.S 1 addition, 4 deletionsarch/s390/kernel/relocate_kernel.S
- arch/s390/kernel/relocate_kernel64.S 1 addition, 4 deletionsarch/s390/kernel/relocate_kernel64.S
- arch/s390/kernel/reset.S 48 additions, 0 deletionsarch/s390/kernel/reset.S
- arch/s390/kernel/setup.c 39 additions, 27 deletionsarch/s390/kernel/setup.c
Loading
Please register or sign in to comment