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] remove __io_virt and mmiowb. [S390] cio: use ARRAY_SIZE in device_id.c [S390] cio: Fixup interface for setting options on ccw devices. [S390] smp_call_function/smp_call_function_on locking.
Showing
- arch/s390/kernel/smp.c 9 additions, 6 deletionsarch/s390/kernel/smp.c
- drivers/s390/cio/device_id.c 2 additions, 1 deletiondrivers/s390/cio/device_id.c
- drivers/s390/cio/device_ops.c 30 additions, 2 deletionsdrivers/s390/cio/device_ops.c
- drivers/s390/cio/qdio.c 1 addition, 1 deletiondrivers/s390/cio/qdio.c
- include/asm-s390/ccwdev.h 2 additions, 0 deletionsinclude/asm-s390/ccwdev.h
- include/asm-s390/io.h 1 addition, 5 deletionsinclude/asm-s390/io.h
Loading
Please register or sign in to comment