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] kexec: Disable ftrace during kexec [S390] support XZ compressed kernel [S390] css_bus_type: make it static [S390] css_driver: remove duplicate members [S390] css: remove subchannel private [S390] css: move chsc_private to drv_data [S390] css: move io_private to drv_data [S390] cio: move cdev pointer to io_subchannel_private [S390] cio: move options to io_sch_private [S390] cio: move asms to generic header [S390] cio: move orb definitions to separate header [S390] Write protect module text and RO data [S390] dasd: get rid of compile warning [S390] remove superfluous check from do_IRQ [S390] remove redundant stack check option
No related branches found
No related tags found
Showing
- arch/s390/Kconfig 6 additions, 15 deletionsarch/s390/Kconfig
- arch/s390/Kconfig.debug 3 additions, 0 deletionsarch/s390/Kconfig.debug
- arch/s390/Makefile 1 addition, 2 deletionsarch/s390/Makefile
- arch/s390/boot/compressed/Makefile 5 additions, 1 deletionarch/s390/boot/compressed/Makefile
- arch/s390/boot/compressed/misc.c 5 additions, 0 deletionsarch/s390/boot/compressed/misc.c
- arch/s390/include/asm/cacheflush.h 4 additions, 0 deletionsarch/s390/include/asm/cacheflush.h
- arch/s390/kernel/machine_kexec.c 2 additions, 0 deletionsarch/s390/kernel/machine_kexec.c
- arch/s390/mm/Makefile 1 addition, 0 deletionsarch/s390/mm/Makefile
- arch/s390/mm/pageattr.c 55 additions, 0 deletionsarch/s390/mm/pageattr.c
- drivers/s390/block/dasd_eckd.c 1 addition, 0 deletionsdrivers/s390/block/dasd_eckd.c
- drivers/s390/cio/chsc_sch.c 10 additions, 7 deletionsdrivers/s390/cio/chsc_sch.c
- drivers/s390/cio/cio.c 12 additions, 31 deletionsdrivers/s390/cio/cio.c
- drivers/s390/cio/cio.h 0 additions, 11 deletionsdrivers/s390/cio/cio.h
- drivers/s390/cio/css.c 2 additions, 4 deletionsdrivers/s390/cio/css.c
- drivers/s390/cio/css.h 0 additions, 10 deletionsdrivers/s390/cio/css.h
- drivers/s390/cio/device.c 15 additions, 8 deletionsdrivers/s390/cio/device.c
- drivers/s390/cio/io_sch.h 25 additions, 89 deletionsdrivers/s390/cio/io_sch.h
- drivers/s390/cio/ioasm.h 34 additions, 0 deletionsdrivers/s390/cio/ioasm.h
- drivers/s390/cio/orb.h 67 additions, 0 deletionsdrivers/s390/cio/orb.h
Loading
Please register or sign in to comment