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] Update default configuration. [S390] Have param.h simply include <asm-generic/param.h>. [S390] qdio: convert global statistics to per-device stats
No related branches found
No related tags found
Showing
- arch/s390/defconfig 75 additions, 11 deletionsarch/s390/defconfig
- arch/s390/include/asm/param.h 2 additions, 26 deletionsarch/s390/include/asm/param.h
- drivers/s390/cio/Makefile 1 addition, 1 deletiondrivers/s390/cio/Makefile
- drivers/s390/cio/qdio.h 35 additions, 1 deletiondrivers/s390/cio/qdio.h
- drivers/s390/cio/qdio_debug.c 106 additions, 8 deletionsdrivers/s390/cio/qdio_debug.c
- drivers/s390/cio/qdio_main.c 33 additions, 38 deletionsdrivers/s390/cio/qdio_main.c
- drivers/s390/cio/qdio_perf.c 0 additions, 149 deletionsdrivers/s390/cio/qdio_perf.c
- drivers/s390/cio/qdio_perf.h 0 additions, 62 deletionsdrivers/s390/cio/qdio_perf.h
- drivers/s390/cio/qdio_thinint.c 2 additions, 6 deletionsdrivers/s390/cio/qdio_thinint.c
Loading
Please register or sign in to comment