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] tape: deadlock on system work queue [S390] keyboard: integer underflow bug [S390] xpram: remove __initdata attribute from module parameters
Showing
- drivers/s390/block/xpram.c 2 additions, 2 deletionsdrivers/s390/block/xpram.c
- drivers/s390/char/keyboard.c 2 additions, 1 deletiondrivers/s390/char/keyboard.c
- drivers/s390/char/tape.h 8 additions, 0 deletionsdrivers/s390/char/tape.h
- drivers/s390/char/tape_34xx.c 41 additions, 18 deletionsdrivers/s390/char/tape_34xx.c
- drivers/s390/char/tape_3590.c 67 additions, 16 deletionsdrivers/s390/char/tape_3590.c
Loading
Please register or sign in to comment