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] MAINTAINERS: Update zcrypt driver entry
  [S390] Randomize PIEs
  [S390] Randomise the brk region
  [S390] Add is_32bit_task() helper function
  [S390] Randomize lower bits of stack address
  [S390] Randomize mmap start address
  [S390] Rearrange mmap.c
  [S390] Enable flexible mmap layout for 64 bit processes
  [S390] vdso: dont map at mmap_base
  [S390] reduce miminum gap between stack and mmap_base
  [S390] mmap: consider stack address randomization
  [S390] Update default configuration
  [S390] cio: path_event overindication after resume

diff --combined MAINTAINERS
index af656ded404ef0ffe2502604ae44bc536ea7c7a2,6ce9191d658d24f05b9555d197aab277ba194e0f..89e4d4b145bb7e73b4c45671a84b401a5d8694c1
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -496,6 -496,7 +496,6 @@@ S: Supporte
  F:    arch/x86/kernel/microcode_amd.c
  
  AMS (Apple Motion Sensor) DRIVER
 -M:    Stelian Pop <stelian@popies.net>
  M:    Michael Hanselmann <linux-kernel@hansmi.ch>
  S:    Supported
  F:    drivers/macintosh/ams/
@@@ -1523,14 -1524,6 +1523,14 @@@ S:    Supporte
  F:    block/bsg.c
  F:    include/linux/bsg.h
  
 +BT87X AUDIO DRIVER
 +M:    Clemens Ladisch <clemens@ladisch.de>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +T:    git git://git.alsa-project.org/alsa-kernel.git
 +S:    Maintained
 +F:    Documentation/sound/alsa/Bt87x.txt
 +F:    sound/pci/bt87x.c
 +
  BT8XXGPIO DRIVER
  M:    Michael Buesch <mb@bu3sch.de>
  W:    http://bu3sch.de/btgpio.php
@@@ -1556,13 -1549,6 +1556,13 @@@ S:    Maintaine
  F:    Documentation/video4linux/bttv/
  F:    drivers/media/video/bt8xx/bttv*
  
 +C-MEDIA CMI8788 DRIVER
 +M:    Clemens Ladisch <clemens@ladisch.de>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +T:    git git://git.alsa-project.org/alsa-kernel.git
 +S:    Maintained
 +F:    sound/pci/oxygen/
 +
  CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS
  M:    David Howells <dhowells@redhat.com>
  L:    linux-cachefs@redhat.com
@@@ -2022,7 -2008,7 +2022,7 @@@ F:      drivers/scsi/dc395x.
  DCCP PROTOCOL
  M:    Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
  L:    dccp@vger.kernel.org
 -W:    http://linux-net.osdl.org/index.php/DCCP
 +W:    http://www.linuxfoundation.org/collaborate/workgroups/networking/dccp
  S:    Maintained
  F:    include/linux/dccp.h
  F:    include/linux/tfrc.h
@@@ -2354,13 -2340,6 +2354,13 @@@ W:    bluesmoke.sourceforge.ne
  S:    Maintained
  F:    drivers/edac/r82600_edac.c
  
 +EDIROL UA-101/UA-1000 DRIVER
 +M:    Clemens Ladisch <clemens@ladisch.de>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +T:    git git://git.alsa-project.org/alsa-kernel.git
 +S:    Maintained
 +F:    sound/usb/misc/ua101.c
 +
  EEEPC LAPTOP EXTRAS DRIVER
  M:    Corentin Chary <corentincj@iksaif.net>
  L:    acpi4asus-user@lists.sourceforge.net
@@@ -2451,7 -2430,7 +2451,7 @@@ ETHERNET BRIDG
  M:    Stephen Hemminger <shemminger@linux-foundation.org>
  L:    bridge@lists.linux-foundation.org
  L:    netdev@vger.kernel.org
 -W:    http://www.linux-foundation.org/en/Net:Bridge
 +W:    http://www.linuxfoundation.org/en/Net:Bridge
  S:    Maintained
  F:    include/linux/netfilter_bridge/
  F:    net/bridge/
@@@ -3529,13 -3508,6 +3529,13 @@@ L:    linux-serial@vger.kernel.or
  S:    Maintained
  F:    drivers/serial/jsm/
  
 +K10TEMP HARDWARE MONITORING DRIVER
 +M:    Clemens Ladisch <clemens@ladisch.de>
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +F:    Documentation/hwmon/k10temp
 +F:    drivers/hwmon/k10temp.c
 +
  K8TEMP HARDWARE MONITORING DRIVER
  M:    Rudolf Marek <r.marek@assembler.cz>
  L:    lm-sensors@lm-sensors.org
@@@ -4121,8 -4093,9 +4121,8 @@@ F:      include/linux/module.
  F:    kernel/module.c
  
  MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER
 -M:    Stelian Pop <stelian@popies.net>
  W:    http://popies.net/meye/
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/video4linux/meye.txt
  F:    drivers/media/video/meye.*
  F:    include/linux/meye.h
@@@ -4410,11 -4383,11 +4410,11 @@@ F:   Documentation/scsi/NinjaSCSI.tx
  F:    drivers/scsi/nsp32*
  
  NTFS FILESYSTEM
 -M:    Anton Altaparmakov <aia21@cantab.net>
 +M:    Anton Altaparmakov <anton@tuxera.com>
  L:    linux-ntfs-dev@lists.sourceforge.net
 -W:    http://www.linux-ntfs.org/
 +W:    http://www.tuxera.com/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git
 -S:    Maintained
 +S:    Supported
  F:    Documentation/filesystems/ntfs.txt
  F:    fs/ntfs/
  
@@@ -4566,13 -4539,6 +4566,13 @@@ F:    drivers/o
  F:    include/linux/of*.h
  K:    of_get_property
  
 +OPL4 DRIVER
 +M:    Clemens Ladisch <clemens@ladisch.de>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +T:    git git://git.alsa-project.org/alsa-kernel.git
 +S:    Maintained
 +F:    sound/drivers/opl4/
 +
  OPROFILE
  M:    Robert Richter <robert.richter@amd.com>
  L:    oprofile-list@lists.sf.net
@@@ -4669,7 -4635,7 +4669,7 @@@ M:      Jeremy Fitzhardinge <jeremy@xensourc
  M:    Chris Wright <chrisw@sous-sol.org>
  M:    Alok Kataria <akataria@vmware.com>
  M:    Rusty Russell <rusty@rustcorp.com.au>
 -L:    virtualization@lists.osdl.org
 +L:    virtualization@lists.linux-foundation.org
  S:    Supported
  F:    Documentation/ia64/paravirt_ops.txt
  F:    arch/*/kernel/paravirt*
@@@ -5167,6 -5133,11 +5167,6 @@@ F:     kernel/rcu
  F:    kernel/srcu*
  X:    kernel/rcutorture.c
  
 -REAL TIME CLOCK DRIVER (LEGACY)
 -M:    Paul Gortmaker <p_gortmaker@yahoo.com>
 -S:    Maintained
 -F:    drivers/char/rtc.c
 -
  REAL TIME CLOCK (RTC) SUBSYSTEM
  M:    Alessandro Zummo <a.zummo@towertech.it>
  L:    rtc-linux@googlegroups.com
@@@ -5272,8 -5243,7 +5272,7 @@@ S:      Supporte
  F:    drivers/s390/net/
  
  S390 ZCRYPT DRIVER
- M:    Felix Beck <felix.beck@de.ibm.com>
- M:    Ralph Wuerthner <ralph.wuerthner@de.ibm.com>
+ M:    Holger Dengler <hd@linux.vnet.ibm.com>
  M:    linux390@de.ibm.com
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -5319,7 -5289,7 +5318,7 @@@ SAMSUNG AUDIO (ASoC) DRIVER
  M:    Jassi Brar <jassi.brar@samsung.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Supported
 -F:    sound/soc/s3c24xx
 +F:    sound/soc/samsung
  
  TIMEKEEPING, NTP
  M:    John Stultz <johnstul@us.ibm.com>
@@@ -6327,13 -6297,6 +6326,13 @@@ S:    Maintaine
  W:    http://www.one-eyed-alien.net/~mdharm/linux-usb/
  F:    drivers/usb/storage/
  
 +USB MIDI DRIVER
 +M:    Clemens Ladisch <clemens@ladisch.de>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +T:    git git://git.alsa-project.org/alsa-kernel.git
 +S:    Maintained
 +F:    sound/usb/midi.*
 +
  USB OHCI DRIVER
  M:    David Brownell <dbrownell@users.sourceforge.net>
  L:    linux-usb@vger.kernel.org
@@@ -6573,7 -6536,7 +6572,7 @@@ F:      include/linux/virtio_console.
  VIRTIO HOST (VHOST)
  M:    "Michael S. Tsirkin" <mst@redhat.com>
  L:    kvm@vger.kernel.org
 -L:    virtualization@lists.osdl.org
 +L:    virtualization@lists.linux-foundation.org
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/vhost/
@@@ -6592,12 -6555,13 +6591,12 @@@ F:   Documentation/i2c/busses/i2c-viapr
  F:    drivers/i2c/busses/i2c-viapro.c
  
  VIA SD/MMC CARD CONTROLLER DRIVER
 -M:    Joseph Chan <JosephChan@via.com.tw>
 +M:    Bruce Chang <brucechang@via.com.tw>
  M:    Harald Welte <HaraldWelte@viatech.com>
  S:    Maintained
  F:    drivers/mmc/host/via-sdmmc.c
  
  VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
 -M:    Joseph Chan <JosephChan@via.com.tw>
  M:    Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
  L:    linux-fbdev@vger.kernel.org
  S:    Maintained
@@@ -6622,7 -6586,7 +6621,7 @@@ F:      net/8021q
  
  VLYNQ BUS
  M:    Florian Fainelli <florian@openwrt.org>
 -L:    openwrt-devel@lists.openwrt.org
 +L:    openwrt-devel@lists.openwrt.org (subscribers-only)
  S:    Maintained
  F:    drivers/vlynq/vlynq.c
  F:    include/linux/vlynq.h
@@@ -6842,7 -6806,7 +6841,7 @@@ XEN HYPERVISOR INTERFAC
  M:    Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  L:    xen-devel@lists.xensource.com (moderated for non-subscribers)
 -L:    virtualization@lists.osdl.org
 +L:    virtualization@lists.linux-foundation.org
  S:    Supported
  F:    arch/x86/xen/
  F:    drivers/*/xen-*front.c