[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-mips-cvs
Subject:    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
From:       linux-mips () linux-mips ! org
Date:       2006-04-29 13:11:17
Message-ID: S8133515AbWD2NLY/20060429131124Z+858 () ftp ! linux-mips ! org
[Download RAW message or body]

Author: Ralf Baechle <ralf@linux-mips.org> Sat Apr 29 14:10:24 2006 +0100
Commit: e939e8445ad91699bbfeef9b1e372f299f9b9b61
Gitweb: http://www.linux-mips.org/g/linux/e939e844
Branch: master

---

 Documentation/power/video.txt     |    2 -
 arch/i386/Kconfig                 |    4 +
 arch/i386/kernel/kprobes.c        |   21 ++----
 arch/i386/kernel/smpboot.c        |    4 +
 arch/s390/kernel/compat_signal.c  |    2 -
 arch/s390/kernel/compat_wrapper.S |   42 +++++++++++++
 arch/s390/kernel/syscalls.S       |    5 ++
 arch/s390/kernel/vmlinux.lds.S    |    4 +
 arch/s390/mm/extmem.c             |   19 +++++-
 drivers/char/mwave/mwavedd.c      |    2 -
 drivers/char/tipar.c              |    2 -
 drivers/pcmcia/i82365.c           |    7 +-
 drivers/s390/block/dasd.c         |    5 ++
 drivers/s390/block/dasd_devmap.c  |  102 +++++++++++++++++++++++++++++++
 drivers/s390/block/dasd_eckd.c    |   51 +++++++++++++++
 drivers/s390/block/dasd_eckd.h    |   46 ++++++++------
 drivers/s390/block/dasd_int.h     |   12 ++++
 drivers/s390/char/tape_3590.c     |   22 +++----
 drivers/s390/char/tape_std.h      |    1 
 drivers/s390/cio/chsc.c           |   30 ++-------
 drivers/s390/cio/qdio.c           |   36 ++++++++---
 drivers/s390/s390mach.c           |   33 ++++++++--
 drivers/video/Kconfig             |    2 +
 include/asm-s390/cache.h          |    2 +
 include/asm-s390/futex.h          |  123 ++++++++++++++++++++++++++++++++++++-
 include/asm-xtensa/signal.h       |    2 -
 include/linux/signal.h            |    4 +
 kernel/irq/manage.c               |    6 +-
 kernel/power/main.c               |    2 -
 mm/slab.c                         |    3 +
 sound/oss/Kconfig                 |   14 ++++
 31 files changed, 504 insertions(+), 106 deletions(-)

[prev in list] [next in list] [prev in thread] [next in thread]