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] fix kvm defines for 31 bit compile [S390] use generic RCU page-table freeing code [S390] qdio: Split SBAL entry flags [S390] kvm-s390: fix stfle facilities numbers >=64 [S390] kvm-s390: Fix host crash on misbehaving guests
Showing
- arch/s390/Kconfig 1 addition, 0 deletionsarch/s390/Kconfig
- arch/s390/include/asm/pgalloc.h 4 additions, 4 deletionsarch/s390/include/asm/pgalloc.h
- arch/s390/include/asm/pgtable.h 26 additions, 13 deletionsarch/s390/include/asm/pgtable.h
- arch/s390/include/asm/qdio.h 28 additions, 91 deletionsarch/s390/include/asm/qdio.h
- arch/s390/include/asm/tlb.h 42 additions, 52 deletionsarch/s390/include/asm/tlb.h
- arch/s390/kvm/kvm-s390.c 1 addition, 0 deletionsarch/s390/kvm/kvm-s390.c
- arch/s390/kvm/sie64a.S 2 additions, 0 deletionsarch/s390/kvm/sie64a.S
- arch/s390/mm/pgtable.c 119 additions, 173 deletionsarch/s390/mm/pgtable.c
- drivers/s390/cio/qdio_main.c 3 additions, 3 deletionsdrivers/s390/cio/qdio_main.c
- drivers/s390/net/qeth_core.h 1 addition, 1 deletiondrivers/s390/net/qeth_core.h
- drivers/s390/net/qeth_core_main.c 30 additions, 27 deletionsdrivers/s390/net/qeth_core_main.c
- drivers/s390/scsi/zfcp_fsf.c 23 additions, 22 deletionsdrivers/s390/scsi/zfcp_fsf.c
- drivers/s390/scsi/zfcp_qdio.c 6 additions, 5 deletionsdrivers/s390/scsi/zfcp_qdio.c
- drivers/s390/scsi/zfcp_qdio.h 5 additions, 4 deletionsdrivers/s390/scsi/zfcp_qdio.h
Loading
Please register or sign in to comment