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: [S390] Poison init section before freeing it. [S390] Use add_active_range() and free_area_init_nodes(). [S390] Virtual memmap for s390. [S390] Update documentation for dynamic subchannel mapping. [S390] Use dev->groups for adding/removing the subchannel attribute group. [S390] Support for disconnected devices reappearing on another subchannel. [S390] subchannel lock conversion. [S390] Some preparations for the dynamic subchannel mapping patch. [S390] runtime switch for qdio performance statistics [S390] New DASD feature for ERP related logging [S390] add reset call handler to the ap bus. [S390] more workqueue fixes. [S390] workqueue fixes. [S390] uaccess_pt: add missing down_read() and convert to is_init().
Showing
- Documentation/s390/driver-model.txt 7 additions, 0 deletionsDocumentation/s390/driver-model.txt
- arch/s390/Kconfig 6 additions, 8 deletionsarch/s390/Kconfig
- arch/s390/defconfig 0 additions, 1 deletionarch/s390/defconfig
- arch/s390/kernel/setup.c 13 additions, 42 deletionsarch/s390/kernel/setup.c
- arch/s390/lib/uaccess_pt.c 3 additions, 2 deletionsarch/s390/lib/uaccess_pt.c
- arch/s390/mm/Makefile 1 addition, 1 deletionarch/s390/mm/Makefile
- arch/s390/mm/extmem.c 26 additions, 80 deletionsarch/s390/mm/extmem.c
- arch/s390/mm/init.c 47 additions, 137 deletionsarch/s390/mm/init.c
- arch/s390/mm/vmem.c 381 additions, 0 deletionsarch/s390/mm/vmem.c
- drivers/s390/block/dasd.c 4 additions, 4 deletionsdrivers/s390/block/dasd.c
- drivers/s390/block/dasd_3990_erp.c 9 additions, 14 deletionsdrivers/s390/block/dasd_3990_erp.c
- drivers/s390/block/dasd_devmap.c 49 additions, 0 deletionsdrivers/s390/block/dasd_devmap.c
- drivers/s390/block/dasd_int.h 0 additions, 4 deletionsdrivers/s390/block/dasd_int.h
- drivers/s390/char/ctrlchar.c 5 additions, 4 deletionsdrivers/s390/char/ctrlchar.c
- drivers/s390/char/tape.h 2 additions, 1 deletiondrivers/s390/char/tape.h
- drivers/s390/char/tape_34xx.c 11 additions, 12 deletionsdrivers/s390/char/tape_34xx.c
- drivers/s390/char/tape_3590.c 4 additions, 3 deletionsdrivers/s390/char/tape_3590.c
- drivers/s390/char/tape_block.c 9 additions, 5 deletionsdrivers/s390/char/tape_block.c
- drivers/s390/char/tape_core.c 7 additions, 7 deletionsdrivers/s390/char/tape_core.c
- drivers/s390/cio/chsc.c 14 additions, 14 deletionsdrivers/s390/cio/chsc.c
Loading
Please register or sign in to comment