Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
Merge commit. Changes below are compared with the first parent: 3d412f60.
Changes
25 files changed · +587 −520
Only the first 600 diff lines are shown. Download the complete patch.
Documentation/DocBook/s390-drivers.tmpl
View filearch/s390/Kconfig
View filearch/s390/Kconfig.debug
View filearch/s390/kernel/entry.S
View filearch/s390/kernel/entry64.S
View filearch/s390/kernel/ipl.c
View filearch/s390/kernel/setup.c
View filearch/s390/kernel/smp.c
View filearch/s390/kernel/stacktrace.c
View filearch/s390/kernel/traps.c
View filearch/s390/kernel/vmlinux.lds.S
View filearch/s390/mm/init.c
View filearch/s390/mm/vmem.c
View filedrivers/s390/block/dasd.c
View filedrivers/s390/block/dasd_3990_erp.c
View fileThis diff is incomplete. Download the complete patch.
drivers/s390/block/dcssblk.c
View fileThis diff is incomplete. Download the complete patch.
drivers/s390/char/sclp_tty.c
View fileThis diff is incomplete. Download the complete patch.
drivers/s390/char/sclp_vt220.c
View fileThis diff is incomplete. Download the complete patch.
drivers/s390/cio/ccwgroup.c
View fileThis diff is incomplete. Download the complete patch.
drivers/s390/cio/chsc.c
View fileThis diff is incomplete. Download the complete patch.
drivers/s390/cio/device_id.c
View fileThis diff is incomplete. Download the complete patch.
include/asm-s390/bitops.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-s390/cacheflush.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-s390/ccwgroup.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-s390/pgtable.h
View fileThis diff is incomplete. Download the complete patch.