Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus

* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
  Squashfs: update email address
  Squashfs: add extra sanity checks at mount time
  Squashfs: add sanity checks to fragment reading at mount time
  Squashfs: add sanity checks to lookup table reading at mount time
  Squashfs: add sanity checks to id reading at mount time
  Squashfs: add sanity checks to xattr reading at mount time
  Squashfs: reverse order of filesystem table reading
  Squashfs: move table allocation into squashfs_read_table()

diff --combined MAINTAINERS
index d1a1465bec020196165f407da1c58427be4692ab,b28f6a7ca9d76c251f1b3649e7334dccefd4f830..c4fc1daddcb676ab104aee48fb1e8f61f12b92c3
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -72,7 -72,7 +72,7 @@@ Descriptions of section entries
        L: Mailing list that is relevant to this area
        W: Web-page with status/info
        Q: Patchwork web based patch tracking system site
 -      T: SCM tree type and location.  Type is one of: git, hg, quilt, stgit.
 +      T: SCM tree type and location.  Type is one of: git, hg, quilt, stgit, topgit.
        S: Status, one of the following:
           Supported:   Someone is actually paid to look after this.
           Maintained:  Someone actually looks after it.
@@@ -151,7 -151,6 +151,7 @@@ S: Maintaine
  F:    drivers/net/hamradio/6pack.c
  
  8169 10/100/1000 GIGABIT ETHERNET DRIVER
 +M:    Realtek linux nic maintainers <[email protected]>
  M:    Francois Romieu <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -185,9 -184,10 +185,9 @@@ F:        Documentation/filesystems/9p.tx
  F:    fs/9p/
  
  A2232 SERIAL BOARD DRIVER
 -M:    Enver Haase <[email protected]>
  L:    [email protected]
 -S:    Maintained
 -F:    drivers/char/ser_a2232*
 +S:    Orphan
 +F:    drivers/staging/generic_serial/ser_a2232*
  
  AACRAID SCSI RAID DRIVER
  M:    Adaptec OEM Raid Solutions <[email protected]>
@@@ -198,7 -198,7 +198,7 @@@ F: Documentation/scsi/aacraid.tx
  F:    drivers/scsi/aacraid/
  
  ABIT UGURU 1,2 HARDWARE MONITOR DRIVER
 -M:    Hans de Goede <[email protected]>
 +M:    Hans de Goede <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/hwmon/abituguru.c
@@@ -287,36 -287,36 +287,36 @@@ F:      sound/pci/ad1889.
  
  AD525X ANALOG DEVICES DIGITAL POTENTIOMETERS DRIVER
  M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -W:    http://wiki-analog.com/AD5254
 +L:    device-drivers[email protected]
 +W:    http://wiki.analog.com/AD5254
  S:    Supported
  F:    drivers/misc/ad525x_dpot.c
  
  AD5398 CURRENT REGULATOR DRIVER (AD5398/AD5821)
  M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -W:    http://wiki-analog.com/AD5398
 +L:    device-drivers[email protected]
 +W:    http://wiki.analog.com/AD5398
  S:    Supported
  F:    drivers/regulator/ad5398.c
  
  AD714X CAPACITANCE TOUCH SENSOR DRIVER (AD7142/3/7/8/7A)
  M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -W:    http://wiki-analog.com/AD7142
 +L:    device-drivers[email protected]
 +W:    http://wiki.analog.com/AD7142
  S:    Supported
  F:    drivers/input/misc/ad714x.c
  
  AD7877 TOUCHSCREEN DRIVER
  M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -W:    http://wiki-analog.com/AD7877
 +L:    device-drivers[email protected]
 +W:    http://wiki.analog.com/AD7877
  S:    Supported
  F:    drivers/input/touchscreen/ad7877.c
  
  AD7879 TOUCHSCREEN DRIVER (AD7879/AD7889)
  M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -W:    http://wiki-analog.com/AD7879
 +L:    device-drivers[email protected]
 +W:    http://wiki.analog.com/AD7879
  S:    Supported
  F:    drivers/input/touchscreen/ad7879.c
  
@@@ -341,38 -341,30 +341,38 @@@ F:      drivers/net/wireless/adm8211.
  
  ADP5520 BACKLIGHT DRIVER WITH IO EXPANDER (ADP5520/ADP5501)
  M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -W:    http://wiki-analog.com/ADP5520
 +L:    device-drivers[email protected]
 +W:    http://wiki.analog.com/ADP5520
  S:    Supported
  F:    drivers/mfd/adp5520.c
  F:    drivers/video/backlight/adp5520_bl.c
 -F:    drivers/led/leds-adp5520.c
 +F:    drivers/leds/leds-adp5520.c
  F:    drivers/gpio/adp5520-gpio.c
  F:    drivers/input/keyboard/adp5520-keys.c
  
  ADP5588 QWERTY KEYPAD AND IO EXPANDER DRIVER (ADP5588/ADP5587)
  M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -W:    http://wiki-analog.com/ADP5588
 +L:    device-drivers[email protected]
 +W:    http://wiki.analog.com/ADP5588
  S:    Supported
  F:    drivers/input/keyboard/adp5588-keys.c
  F:    drivers/gpio/adp5588-gpio.c
  
  ADP8860 BACKLIGHT DRIVER (ADP8860/ADP8861/ADP8863)
  M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -W:    http://wiki-analog.com/ADP8860
 +L:    device-drivers[email protected]
 +W:    http://wiki.analog.com/ADP8860
  S:    Supported
  F:    drivers/video/backlight/adp8860_bl.c
  
 +ADS1015 HARDWARE MONITOR DRIVER
 +M:    Dirk Eibach <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/ads1015
 +F:    drivers/hwmon/ads1015.c
 +F:    include/linux/i2c/ads1015.h
 +
  ADT746X FAN DRIVER
  M:    Colin Leroy <[email protected]>
  S:    Maintained
@@@ -387,8 -379,8 +387,8 @@@ F: drivers/hwmon/adt7475.
  
  ADXL34X THREE-AXIS DIGITAL ACCELEROMETER DRIVER (ADXL345/ADXL346)
  M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -W:    http://wiki-analog.com/ADXL345
 +L:    device-drivers[email protected]
 +W:    http://wiki.analog.com/ADXL345
  S:    Supported
  F:    drivers/input/misc/adxl34x.c
  
@@@ -405,8 -397,8 +405,8 @@@ S: Maintaine
  F:    sound/oss/aedsp16.c
  
  AFFS FILE SYSTEM
 -M:    Roman Zippel <[email protected]>
 -S:    Maintained
 +L:    [email protected]
 +S:    Orphan
  F:    Documentation/filesystems/affs.txt
  F:    fs/affs/
  
@@@ -473,23 -465,6 +473,23 @@@ M:       Matt Turner <[email protected]
  L:    [email protected]
  F:    arch/alpha/
  
 +ALTERA UART/JTAG UART SERIAL DRIVERS
 +M:    Tobias Klauser <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/tty/serial/altera_uart.c
 +F:    drivers/tty/serial/altera_jtaguart.c
 +F:    include/linux/altera_uart.h
 +F:    include/linux/altera_jtaguart.h
 +
 +AMD FAM15H PROCESSOR POWER MONITORING DRIVER
 +M:    Andreas Herrmann <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/fam15h_power
 +F:    drivers/hwmon/fam15h_power.c
 +
  AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
  M:    Thomas Dahlmann <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -533,11 -508,13 +533,11 @@@ S:      Maintaine
  F:    drivers/infiniband/hw/amso1100/
  
  ANALOG DEVICES INC ASOC CODEC DRIVERS
 -L:    [email protected]
 +L:    device-drivers[email protected]
  L:    [email protected] (moderated for non-subscribers)
 -W:    http://wiki-analog.com/
 +W:    http://wiki.analog.com/
  S:    Supported
  F:    sound/soc/codecs/ad1*
 -F:    sound/soc/codecs/adau*
 -F:    sound/soc/codecs/adav*
  F:    sound/soc/codecs/ssm*
  
  ANALOG DEVICES INC ASOC DRIVERS
@@@ -555,11 -532,12 +555,11 @@@ S:      Maintaine
  F:    sound/aoa/
  
  APM DRIVER
 -M:    Stephen Rothwell <[email protected]>
 -L:    [email protected]
 -W:    http://www.canb.auug.org.au/~sfr/
 -S:    Supported
 +M:    Jiri Kosina <[email protected]>
 +S:    Odd fixes
  F:    arch/x86/kernel/apm_32.c
  F:    include/linux/apm_bios.h
 +F:    drivers/char/apm-emulation.c
  
  APPLE BCM5974 MULTITOUCH DRIVER
  M:    Henrik Rydberg <[email protected]>
@@@ -579,13 -557,6 +579,13 @@@ S:       Maintaine
  F:    drivers/net/appletalk/
  F:    net/appletalk/
  
 +ARASAN COMPACT FLASH PATA CONTROLLER
 +M:    Viresh Kumar <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    include/linux/pata_arasan_cf_data.h
 +F:    drivers/ata/pata_arasan_cf.c
 +
  ARC FRAMEBUFFER DRIVER
  M:    Jaya Kumar <[email protected]>
  S:    Maintained
@@@ -701,8 -672,8 +701,8 @@@ S: Maintaine
  ARM/CLKDEV SUPPORT
  M:    Russell King <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -F:    arch/arm/common/clkdev.c
  F:    arch/arm/include/asm/clkdev.h
 +F:    drivers/clk/clkdev.c
  
  ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT
  M:    Mike Rapoport <[email protected]>
@@@ -737,7 -708,7 +737,7 @@@ ARM/EZX SMARTPHONES (A780, A910, A1200
  M:    Daniel Ribeiro <[email protected]>
  M:    Stefan Schmidt <[email protected]>
  M:    Harald Welte <[email protected]>
 -L:    [email protected] (subscribers-only)
 +L:    [email protected] (moderated for non-subscribers)
  W:    http://www.openezx.org/
  S:    Maintained
  T:    topgit git://git.openezx.org/openezx.git
@@@ -885,13 -856,6 +885,13 @@@ F:       arch/arm/mach-mv78xx0
  F:    arch/arm/mach-orion5x/
  F:    arch/arm/plat-orion/
  
 +ARM/Orion SoC/Technologic Systems TS-78xx platform support
 +M:    Alexander Clouter <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +W:    http://www.digriz.org.uk/ts78xx/kernel
 +S:    Maintained
 +F:    arch/arm/mach-orion5x/ts78xx-*
 +
  ARM/MIOA701 MACHINE SUPPORT
  M:    Robert Jarzmik <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -921,7 -885,7 +921,7 @@@ S: Supporte
  
  ARM/QUALCOMM MSM MACHINE SUPPORT
  M:    David Brown <[email protected]>
 -M:    Daniel Walker <dwalker@codeaurora.org>
 +M:    Daniel Walker <dwalker@fifo99.com>
  M:    Bryan Huntsman <[email protected]>
  L:    [email protected]
  F:    arch/arm/mach-msm/
@@@ -930,9 -894,6 +930,9 @@@ F: drivers/mmc/host/msm_sdcc.
  F:    drivers/mmc/host/msm_sdcc.h
  F:    drivers/tty/serial/msm_serial.h
  F:    drivers/tty/serial/msm_serial.c
 +F:    drivers/platform/msm/
 +F:    drivers/*/pm8???-*
 +F:    include/linux/mfd/pm8xxx/
  T:    git git://codeaurora.org/quic/kernel/davidb/linux-msm.git
  S:    Maintained
  
@@@ -1042,22 -1003,12 +1042,22 @@@ W:   http://www.fluff.org/ben/linux
  S:    Maintained
  F:    arch/arm/mach-s3c64xx/
  
 -ARM/S5P ARM ARCHITECTURES
 +ARM/S5P EXYNOS ARM ARCHITECTURES
  M:    Kukjin Kim <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-s5p*/
 +F:    arch/arm/mach-exynos*/
 +
 +ARM/SAMSUNG MOBILE MACHINE SUPPORT
 +M:    Kyungmin Park <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-s5pv210/mach-aquila.c
 +F:    arch/arm/mach-s5pv210/mach-goni.c
 +F:    arch/arm/mach-exynos4/mach-universal_c210.c
 +F:    arch/arm/mach-exynos4/mach-nuri.c
  
  ARM/SAMSUNG S5P SERIES FIMC SUPPORT
  M:    Kyungmin Park <[email protected]>
@@@ -1081,7 -1032,7 +1081,7 @@@ F:      arch/arm/mach-shmobile
  F:    drivers/sh/
  
  ARM/TELECHIPS ARM ARCHITECTURE
 -M:    "Hans J. Koch" <hjk@linutronix.de>
 +M:    "Hans J. Koch" <hjk@hansjkoch.de>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/plat-tcc/
@@@ -1093,7 -1044,7 +1093,7 @@@ L:      [email protected]
  S:    Maintained
  
  ARM/TETON BGA MACHINE SUPPORT
 -M:    Mark F. Brown <[email protected]>
 +M:    "Mark F. Brown" <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
@@@ -1175,14 -1126,14 +1175,14 @@@ S:   Maintaine
  F:    Documentation/hwmon/asc7621
  F:    drivers/hwmon/asc7621.c
  
 -ASUS ACPI EXTRAS DRIVER
 +ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
  M:    Corentin Chary <[email protected]>
 -M:    Karol Kozimor <[email protected]>
  L:    [email protected]
  L:    [email protected]
  W:    http://acpi4asus.sf.net
  S:    Maintained
 -F:    drivers/platform/x86/asus_acpi.c
 +F:    drivers/platform/x86/asus*.c
 +F:    drivers/platform/x86/eeepc*.c
  
  ASUS ASB100 HARDWARE MONITOR DRIVER
  M:    "Mark M. Hoffman" <[email protected]>
@@@ -1190,6 -1141,14 +1190,6 @@@ L:     [email protected]
  S:    Maintained
  F:    drivers/hwmon/asb100.c
  
 -ASUS LAPTOP EXTRAS DRIVER
 -M:    Corentin Chary <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -W:    http://acpi4asus.sf.net
 -S:    Maintained
 -F:    drivers/platform/x86/asus-laptop.c
 -
  ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
  M:    Dan Williams <[email protected]>
  W:    http://sourceforge.net/projects/xscaleiop
@@@ -1242,6 -1201,13 +1242,6 @@@ W:     http://wireless.kernel.org/en/users/
  S:    Supported
  F:    drivers/net/wireless/ath/ath9k/
  
 -ATHEROS AR9170 WIRELESS DRIVER
 -M:    Christian Lamparter <[email protected]>
 -L:    [email protected]
 -W:    http://wireless.kernel.org/en/users/Drivers/ar9170
 -S:    Maintained
 -F:    drivers/net/wireless/ath/ar9170/
 -
  CARL9170 LINUX COMMUNITY WIRELESS DRIVER
  M:    Christian Lamparter <[email protected]>
  L:    [email protected]
@@@ -1482,7 -1448,7 +1482,7 @@@ F:      drivers/mtd/devices/block2mtd.
  
  BLUETOOTH DRIVERS
  M:    Marcel Holtmann <[email protected]>
 -M:    Gustavo F. Padovan <[email protected]>
 +M:    "Gustavo F. Padovan" <[email protected]>
  L:    [email protected]
  W:    http://www.bluez.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git
@@@ -1491,7 -1457,7 +1491,7 @@@ F:      drivers/bluetooth
  
  BLUETOOTH SUBSYSTEM
  M:    Marcel Holtmann <[email protected]>
 -M:    Gustavo F. Padovan <[email protected]>
 +M:    "Gustavo F. Padovan" <[email protected]>
  L:    [email protected]
  W:    http://www.bluez.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git
@@@ -1501,7 -1467,6 +1501,7 @@@ F:      include/net/bluetooth
  
  BONDING DRIVER
  M:    Jay Vosburgh <[email protected]>
 +M:    Andy Gospodarek <[email protected]>
  L:    [email protected]
  W:    http://sourceforge.net/projects/bonding/
  S:    Supported
@@@ -1727,15 -1692,7 +1727,15 @@@ M:    Andy Whitcroft <[email protected]
  S:    Supported
  F:    scripts/checkpatch.pl
  
 +CHINESE DOCUMENTATION
 +M:    Harry Wei <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/zh_CN/
 +
  CISCO VIC ETHERNET NIC DRIVER
 +M:    Christian Benvenuti <[email protected]>
  M:    Vasanthy Kolluri <[email protected]>
  M:    Roopa Prabhu <[email protected]>
  M:    David Wang <[email protected]>
@@@ -1834,10 -1791,11 +1834,10 @@@ S:   Maintaine
  F:    drivers/platform/x86/compal-laptop.c
  
  COMPUTONE INTELLIPORT MULTIPORT CARD
 -M:    "Michael H. Warfield" <[email protected]>
  W:    http://www.wittsend.com/computone.html
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/serial/computone.txt
 -F:    drivers/char/ip2/
 +F:    drivers/staging/tty/ip2/
  
  CONEXANT ACCESSRUNNER USB DRIVER
  M:    Simon Arlott <[email protected]>
@@@ -2020,7 -1978,7 +2020,7 @@@ F:      drivers/net/wan/cycx
  CYCLADES ASYNC MUX DRIVER
  W:    http://www.cyclades.com/
  S:    Orphan
 -F:    drivers/char/cyclades.c
 +F:    drivers/tty/cyclades.c
  F:    include/linux/cyclades.h
  
  CYCLADES PC300 DRIVER
@@@ -2043,8 -2001,9 +2043,8 @@@ F:      net/ax25/ax25_timer.
  F:    net/ax25/sysctl_net_ax25.c
  
  DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
 -M:    Tobias Ringstrom <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/networking/dmfe.txt
  F:    drivers/net/tulip/dmfe.c
  
@@@ -2067,7 -2026,7 +2067,7 @@@ F:      Documentation/scsi/dc395x.tx
  F:    drivers/scsi/dc395x.*
  
  DCCP PROTOCOL
 -M:    Arnaldo Carvalho de Melo <[email protected]>
 +M:    Gerrit Renker <[email protected]>
  L:    [email protected]
  W:    http://www.linuxfoundation.org/collaborate/workgroups/networking/dccp
  S:    Maintained
@@@ -2133,14 -2092,8 +2133,14 @@@ L:    [email protected]
  W:    http://www.digi.com
  S:    Orphan
  F:    Documentation/serial/digiepca.txt
 -F:    drivers/char/epca*
 -F:    drivers/char/digi*
 +F:    drivers/staging/tty/epca*
 +F:    drivers/staging/tty/digi*
 +
 +DIOLAN U2C-12 I2C DRIVER
 +M:    Guenter Roeck <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-diolan-u2c.c
  
  DIRECTORY NOTIFICATION (DNOTIFY)
  M:    Eric Paris <[email protected]>
@@@ -2173,7 -2126,6 +2173,7 @@@ S:      Supporte
  F:    fs/dlm/
  
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
 +M:    Vinod Koul <[email protected]>
  M:    Dan Williams <[email protected]>
  S:    Supported
  F:    drivers/dma/
@@@ -2253,10 -2205,10 +2253,10 @@@ F:   drivers/gpu/drm
  F:    include/drm/
  
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
 -M:    Chris Wilson <[email protected]>
 +M:    Keith Packard <[email protected]>
  L:    [email protected] (subscribers-only)
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git
  S:    Supported
  F:    drivers/gpu/drm/i915
  F:    include/drm/i915*
@@@ -2388,7 -2340,7 +2388,7 @@@ F:      include/linux/edac_mce.
  
  EDAC-I82975X
  M:    Ranganathan Desikan <[email protected]>
 -M:    "Arvind R." <arvind@jetztechnologies.com>
 +M:    "Arvind R." <arvino55@gmail.com>
  L:    [email protected] (moderated for non-subscribers)
  W:    bluesmoke.sourceforge.net
  S:    Maintained
@@@ -2415,6 -2367,22 +2415,6 @@@ T:     git git://git.alsa-project.org/alsa-
  S:    Maintained
  F:    sound/usb/misc/ua101.c
  
 -EEEPC LAPTOP EXTRAS DRIVER
 -M:    Corentin Chary <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -W:    http://acpi4asus.sf.net
 -S:    Maintained
 -F:    drivers/platform/x86/eeepc-laptop.c
 -
 -EEEPC WMI EXTRAS DRIVER
 -M:    Corentin Chary <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -W:    http://acpi4asus.sf.net
 -S:    Maintained
 -F:    drivers/platform/x86/eeepc-wmi.c
 -
  EFIFB FRAMEBUFFER DRIVER
  L:    [email protected]
  M:    Peter Jones <[email protected]>
@@@ -2463,7 -2431,8 +2463,7 @@@ F:      include/linux/cb710.
  ENE KB2426 (ENE0100/ENE020XX) INFRARED RECEIVER
  M:    Maxim Levitsky <[email protected]>
  S:    Maintained
 -F:    drivers/media/IR/ene_ir.c
 -F:    drivers/media/IR/ene_ir.h
 +F:    drivers/media/rc/ene_ir.*
  
  EPSON 1355 FRAMEBUFFER DRIVER
  M:    Christopher Hoover <[email protected]>
@@@ -2614,14 -2583,12 +2614,14 @@@ F:   drivers/net/wan/dlci.
  F:    drivers/net/wan/sdla.c
  
  FRAMEBUFFER LAYER
 +M:    Paul Mundt <[email protected]>
  L:    [email protected]
  W:    http://linux-fbdev.sourceforge.net/
  Q:    http://patchwork.kernel.org/project/linux-fbdev/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/fb/
 +F:    Documentation/devicetree/bindings/fb/
  F:    drivers/video/
  F:    include/video/
  F:    include/linux/fb.h
@@@ -2807,26 -2774,38 +2807,26 @@@ F:   Documentation/isdn/README.gigase
  F:    drivers/isdn/gigaset/
  F:    include/linux/gigaset_dev.h
  
 -GRETH 10/100/1G Ethernet MAC device driver
 -M:    Kristoffer Glembo <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/net/greth*
 -
 -HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
 -M:    Frank Seidel <[email protected]>
 -L:    [email protected]
 -W:    http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
 +GPIO SUBSYSTEM
 +M:    Grant Likely <[email protected]>
  S:    Maintained
 -F:    drivers/platform/x86/hdaps.c
 +T:    git git://git.secretlab.ca/git/linux-2.6.git
 +F:    Documentation/gpio.txt
 +F:    drivers/gpio/
 +F:    include/linux/gpio*
  
 -HWPOISON MEMORY FAILURE HANDLING
 -M:    Andi Kleen <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git hwpoison
 +GRE DEMULTIPLEXER DRIVER
 +M:    Dmitry Kozlov <[email protected]>
 +L:    [email protected]
  S:    Maintained
 -F:    mm/memory-failure.c
 -F:    mm/hwpoison-inject.c
 -
 -HYPERVISOR VIRTUAL CONSOLE DRIVER
 -L:    [email protected]
 -S:    Odd Fixes
 -F:    drivers/char/hvc_*
 +F:    net/ipv4/gre.c
 +F:    include/net/gre.h
  
 -iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
 -M:    Peter Jones <pjones@redhat.com>
 -M:    Konrad Rzeszutek Wilk <[email protected]>
 +GRETH 10/100/1G Ethernet MAC device driver
 +M:    Kristoffer Glembo <kristoffer@gaisler.com>
 +L:    [email protected]
  S:    Maintained
 -F:    drivers/firmware/iscsi_ibft*
 +F:    drivers/net/greth*
  
  GSPCA FINEPIX SUBDRIVER
  M:    Frank Zago <[email protected]>
@@@ -2878,32 -2857,13 +2878,32 @@@ T:   git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/media/video/gspca/
  
 +HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
 +M:    Frank Seidel <[email protected]>
 +L:    [email protected]
 +W:    http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
 +S:    Maintained
 +F:    drivers/platform/x86/hdaps.c
 +
 +HWPOISON MEMORY FAILURE HANDLING
 +M:    Andi Kleen <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git hwpoison
 +S:    Maintained
 +F:    mm/memory-failure.c
 +F:    mm/hwpoison-inject.c
 +
 +HYPERVISOR VIRTUAL CONSOLE DRIVER
 +L:    [email protected]
 +S:    Odd Fixes
 +F:    drivers/tty/hvc/
 +
  HARDWARE MONITORING
  M:    Jean Delvare <[email protected]>
  M:    Guenter Roeck <[email protected]>
  L:    [email protected]
  W:    http://www.lm-sensors.org/
  T:    quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/
 -T:    quilt kernel.org/pub/linux/kernel/people/groeck/linux-staging/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
  S:    Maintained
  F:    Documentation/hwmon/
@@@ -2932,7 -2892,7 +2932,7 @@@ F:      Documentation/blockdev/cpqarray.tx
  F:    drivers/block/cpqarray.*
  
  HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
 -M:    Stephen M. Cameron <[email protected]>
 +M:    "Stephen M. Cameron" <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/scsi/hpsa.txt
@@@ -2948,8 -2908,8 +2948,8 @@@ F:      drivers/block/cciss
  F:    include/linux/cciss_ioctl.h
  
  HFS FILESYSTEM
 -M:    Roman Zippel <[email protected]>
 -S:    Maintained
 +L:    [email protected]
 +S:    Orphan
  F:    Documentation/filesystems/hfs.txt
  F:    fs/hfs/
  
@@@ -2989,7 -2949,7 +2989,7 @@@ F:      kernel/hrtimer.
  F:    kernel/time/clockevents.c
  F:    kernel/time/tick*.*
  F:    kernel/time/timer_*.c
 -F     include/linux/clockevents.h
 +F:    include/linux/clockevents.h
  F:    include/linux/hrtimer.h
  
  HIGH-SPEED SCC DRIVER FOR AX.25
@@@ -3162,6 -3122,15 +3162,6 @@@ L:     [email protected]
  S:    Supported
  F:    drivers/idle/i7300_idle.c
  
 -IEEE 1394 SUBSYSTEM
 -M:    Stefan Richter <[email protected]>
 -L:    [email protected]
 -W:    http://ieee1394.wiki.kernel.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
 -S:    Obsolete
 -F:    Documentation/debugging-via-ohci1394.txt
 -F:    drivers/ieee1394/
 -
  IEEE 802.15.4 SUBSYSTEM
  M:    Dmitry Eremin-Solenikov <[email protected]>
  M:    Sergey Lapin <[email protected]>
@@@ -3365,12 -3334,6 +3365,12 @@@ F:    Documentation/wimax/README.i2400
  F:    drivers/net/wimax/i2400m/
  F:    include/linux/wimax/i2400m.h
  
 +INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy)
 +M:    Stanislaw Gruszka <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/wireless/iwlegacy/
 +
  INTEL WIRELESS WIFI LINK (iwlwifi)
  M:    Wey-Yi Guy <[email protected]>
  M:    Intel Linux Wireless <[email protected]>
@@@ -3452,7 -3415,7 +3452,7 @@@ M:      Jiri Kosina <[email protected]
  M:    David Sterba <[email protected]>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/ipwireless_cs.git
 -F:    drivers/char/pcmcia/ipwireless/
 +F:    drivers/tty/ipwireless/
  
  IPX NETWORK LAYER
  M:    Arnaldo Carvalho de Melo <[email protected]>
@@@ -3465,7 -3428,6 +3465,7 @@@ F:      net/ipx
  IRDA SUBSYSTEM
  M:    Samuel Ortiz <[email protected]>
  L:    [email protected] (subscribers-only)
 +L:    [email protected]
  W:    http://irda.sourceforge.net/
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git
@@@ -3487,12 -3449,6 +3487,12 @@@ F:    Documentation/isapnp.tx
  F:    drivers/pnp/isapnp/
  F:    include/linux/isapnp.h
  
 +iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
 +M:    Peter Jones <[email protected]>
 +M:    Konrad Rzeszutek Wilk <[email protected]>
 +S:    Maintained
 +F:    drivers/firmware/iscsi_ibft*
 +
  ISCSI
  M:    Mike Christie <[email protected]>
  L:    [email protected]
@@@ -3547,7 -3503,7 +3547,7 @@@ F:      drivers/hwmon/jc42.
  F:    Documentation/hwmon/jc42
  
  JFS FILESYSTEM
 -M:    Dave Kleikamp <shaggy@linux.vnet.ibm.com>
 +M:    Dave Kleikamp <shaggy@kernel.org>
  L:    [email protected]
  W:    http://jfs.sourceforge.net/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
@@@ -3574,16 -3530,9 +3574,16 @@@ M:    Andrew Morton <akpm@linux-foundation
  M:    Jan Kara <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    fs/jbd*/
 -F:    include/linux/ext*jbd*.h
 -F:    include/linux/jbd*.h
 +F:    fs/jbd/
 +F:    include/linux/ext3_jbd.h
 +F:    include/linux/jbd.h
 +
 +JOURNALLING LAYER FOR BLOCK DEVICES (JBD2)
 +M:    "Theodore Ts'o" <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    fs/jbd2/
 +F:    include/linux/jbd2.h
  
  JSM Neo PCI based serial card
  M:    Breno Leitao <[email protected]>
@@@ -3606,9 -3555,10 +3606,9 @@@ F:     Documentation/hwmon/k8tem
  F:    drivers/hwmon/k8temp.c
  
  KCONFIG
 -M:    Roman Zippel <[email protected]>
 +M:    Michal Marek <[email protected]>
  L:    [email protected]
 -Q:    http://patchwork.kernel.org/project/linux-kbuild/list/
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/kbuild/kconfig-language.txt
  F:    scripts/kconfig/
  
@@@ -3620,6 -3570,12 +3620,6 @@@ W:     http://lse.sourceforge.net/kdump
  S:    Maintained
  F:    Documentation/kdump/
  
 -KERNEL AUTOMOUNTER (AUTOFS)
 -M:    "H. Peter Anvin" <[email protected]>
 -L:    [email protected]
 -S:    Obsolete
 -F:    drivers/staging/autofs/
 -
  KERNEL AUTOMOUNTER v4 (AUTOFS4)
  M:    Ian Kent <[email protected]>
  L:    [email protected]
@@@ -3828,7 -3784,7 +3828,7 @@@ M:      Rusty Russell <[email protected]
  L:    [email protected]
  W:    http://lguest.ozlabs.org/
  S:    Odd Fixes
 -F:    Documentation/lguest/
 +F:    Documentation/virtual/lguest/
  F:    arch/x86/lguest/
  F:    drivers/lguest/
  F:    include/linux/lguest*.h
@@@ -3912,14 -3868,9 +3912,14 @@@ F:    drivers/*/*/*pasemi
  LINUX SECURITY MODULE (LSM) FRAMEWORK
  M:    Chris Wright <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git
  S:    Supported
  
 +LIS3LV02D ACCELEROMETER DRIVER
 +M:    Eric Piel <[email protected]>
 +S:    Maintained
 +F:    Documentation/misc-devices/lis3lv02d
 +F:    drivers/misc/lis3lv02d/
 +
  LLC (802.2)
  M:    Arnaldo Carvalho de Melo <[email protected]>
  S:    Maintained
@@@ -3927,6 -3878,12 +3927,6 @@@ F:     include/linux/llc.
  F:    include/net/llc*
  F:    net/llc/
  
 -LIS3LV02D ACCELEROMETER DRIVER
 -M:    Eric Piel <[email protected]>
 -S:    Maintained
 -F:    Documentation/hwmon/lis3lv02d
 -F:    drivers/hwmon/lis3lv02d.*
 -
  LM73 HARDWARE MONITOR DRIVER
  M:    Guillaume Ligneul <[email protected]>
  L:    [email protected]
@@@ -4014,6 -3971,7 +4014,6 @@@ F:      arch/m32r
  
  M68K ARCHITECTURE
  M:    Geert Uytterhoeven <[email protected]>
 -M:    Roman Zippel <[email protected]>
  L:    [email protected]
  W:    http://www.linux-m68k.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git
@@@ -4103,7 -4061,7 +4103,7 @@@ F:      drivers/video/matrox/matroxfb_
  F:    include/linux/matroxfb.h
  
  MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
 -M:    "Hans J. Koch" <hjk@linutronix.de>
 +M:    "Hans J. Koch" <hjk@hansjkoch.de>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/hwmon/max6650
@@@ -4147,7 -4105,6 +4147,7 @@@ M:      KAMEZAWA Hiroyuki <kamezawa.hiroyu@j
  L:    [email protected]
  S:    Maintained
  F:    mm/memcontrol.c
 +F:    mm/page_cgroup.c
  
  MEMORY TECHNOLOGY DEVICES (MTD)
  M:    David Woodhouse <[email protected]>
@@@ -4219,10 -4176,10 +4219,10 @@@ MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL C
  M:    Jiri Slaby <[email protected]>
  S:    Maintained
  F:    Documentation/serial/moxa-smartio
 -F:    drivers/char/mxser.*
 +F:    drivers/tty/mxser.*
  
  MSI LAPTOP SUPPORT
 -M:    Lee, Chun-Yi <[email protected]>
 +M:    "Lee, Chun-Yi" <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/platform/x86/msi-laptop.c
@@@ -4261,13 -4218,13 +4261,13 @@@ F:   sound/oss/msnd
  
  MULTITECH MULTIPORT CARD (ISICOM)
  S:    Orphan
 -F:    drivers/char/isicom.c
 +F:    drivers/tty/isicom.c
  F:    include/linux/isicom.h
  
  MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
  M:    Felipe Balbi <[email protected]>
  L:    [email protected]
 -T:    git git://gitorious.org/usb/usb.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
  F:    drivers/usb/musb/
  
@@@ -4284,13 -4241,6 +4284,13 @@@ M:    Tim Hockin <[email protected]
  S:    Maintained
  F:    drivers/net/natsemi.c
  
 +NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER
 +M:    Daniel Mack <[email protected]>
 +S:    Maintained
 +L:    [email protected]
 +W:    http://www.native-instruments.com
 +F:    sound/usb/caiaq/
 +
  NCP FILESYSTEM
  M:    Petr Vandrovec <[email protected]>
  S:    Odd Fixes
@@@ -4316,7 -4266,10 +4316,7 @@@ S:     Maintaine
  F:    net/sched/sch_netem.c
  
  NETERION 10GbE DRIVERS (s2io/vxge)
 -M:    Ramkrishna Vepa <[email protected]>
 -M:    Sivakumar Subramani <[email protected]>
 -M:    Sreenivasa Honnur <[email protected]>
 -M:    Jon Mason <[email protected]>
 +M:    Jon Mason <[email protected]>
  L:    [email protected]
  W:    http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
  W:    http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
@@@ -4406,7 -4359,6 +4406,7 @@@ S:      Maintaine
  F:    net/ipv4/
  F:    net/ipv6/
  F:    include/net/ip*
 +F:    arch/x86/net/*
  
  NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
  M:    Paul Moore <[email protected]>
@@@ -4523,21 -4475,11 +4523,21 @@@ S:   Maintaine
  F:    arch/arm/*omap*/*clock*
  
  OMAP POWER MANAGEMENT SUPPORT
 -M:    Kevin Hilman <khilman@deeprootsystems.com>
 +M:    Kevin Hilman <khilman@ti.com>
  L:    [email protected]
  S:    Maintained
  F:    arch/arm/*omap*/*pm*
  
 +OMAP POWERDOMAIN/CLOCKDOMAIN SOC ADAPTATION LAYER SUPPORT
 +M:    Rajendra Nayak <[email protected]>
 +M:    Paul Walmsley <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
 +F:    arch/arm/mach-omap2/powerdomain44xx.c
 +F:    arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
 +F:    arch/arm/mach-omap2/clockdomain44xx.c
 +
  OMAP AUDIO SUPPORT
  M:    Jarkko Nikula <[email protected]>
  L:    [email protected] (subscribers-only)
@@@ -4546,14 -4488,14 +4546,14 @@@ S:   Maintaine
  F:    sound/soc/omap/
  
  OMAP FRAMEBUFFER SUPPORT
 -M:    Tomi Valkeinen <tomi.valkeinen@nokia.com>
 +M:    Tomi Valkeinen <tomi.valkeinen@ti.com>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/video/omap/
  
  OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
 -M:    Tomi Valkeinen <tomi.valkeinen@nokia.com>
 +M:    Tomi Valkeinen <tomi.valkeinen@ti.com>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -4591,18 -4533,11 +4591,18 @@@ L:   [email protected]
  S:    Maintained
  F:    arch/arm/mach-omap2/omap_hwmod_44xx_data.c
  
 +OMAP IMAGE SIGNAL PROCESSOR (ISP)
 +M:    Laurent Pinchart <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/video/omap3isp/*
 +
  OMAP USB SUPPORT
  M:    Felipe Balbi <[email protected]>
  M:    David Brownell <[email protected]>
  L:    [email protected]
  L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
  F:    drivers/usb/*/*omap*
  F:    arch/arm/*omap*/usb*
@@@ -4656,7 -4591,7 +4656,7 @@@ F:      drivers/i2c/busses/i2c-ocores.
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE
  M:    Grant Likely <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  W:    http://fdt.secretlab.ca
  T:    git git://git.secretlab.ca/git/linux-2.6.git
  S:    Maintained
@@@ -4732,6 -4667,7 +4732,6 @@@ F:      drivers/i2c/busses/i2c-pasemi.
  
  PADATA PARALLEL EXECUTION MECHANISM
  M:    Steffen Klassert <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    kernel/padata.c
@@@ -4881,6 -4817,7 +4881,6 @@@ F:      include/crypto/pcrypt.
  PER-CPU MEMORY ALLOCATOR
  M:    Tejun Heo <[email protected]>
  M:    Christoph Lameter <[email protected]>
 -L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git
  S:    Maintained
  F:    include/linux/percpu*.h
@@@ -4935,15 -4872,6 +4935,15 @@@ S:    Maintaine
  F:    drivers/block/pktcdvd.c
  F:    include/linux/pktcdvd.h
  
 +PKUNITY SOC DRIVERS
 +M:    Guan Xuetao <[email protected]>
 +W:    http://mprc.pku.edu.cn/~guanxuetao/linux
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
 +F:    drivers/input/serio/i8042-unicore32io.h
 +F:    drivers/i2c/busses/i2c-puv3.c
 +F:    drivers/video/fb-puv3.c
 +
  PMC SIERRA MaxRAID DRIVER
  M:    Anil Ravindranath <[email protected]>
  L:    [email protected]
@@@ -5018,13 -4946,6 +5018,13 @@@ F:    Documentation/pps
  F:    drivers/pps/
  F:    include/linux/pps*.h
  
 +PPTP DRIVER
 +M:    Dmitry Kozlov <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/pptp.c
 +W:    http://sourceforge.net/projects/accel-pptp
 +
  PREEMPTIBLE KERNEL
  M:    Robert Love <[email protected]>
  L:    [email protected]
@@@ -5214,7 -5135,6 +5214,7 @@@ RALINK RT2X00 WIRELESS LAN DRIVE
  P:    rt2x00 project
  M:    Ivo van Doorn <[email protected]>
  M:    Gertjan van Wingerde <[email protected]>
 +M:    Helmut Schaa <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://rt2x00.serialmonkey.com/
@@@ -5235,7 -5155,6 +5235,7 @@@ F:      drivers/char/random.
  
  RAPIDIO SUBSYSTEM
  M:    Matt Porter <[email protected]>
 +M:    Alexandre Bounine <[email protected]>
  S:    Maintained
  F:    drivers/rapidio/
  
@@@ -5308,22 -5227,17 +5308,22 @@@ S:   Maintaine
  F:    drivers/mtd/nand/r852.c
  F:    drivers/mtd/nand/r852.h
  
 +RICOH R5C592 MEMORYSTICK DRIVER
 +M:    Maxim Levitsky <[email protected]>
 +S:    Maintained
 +F:    drivers/memstick/host/r592.*
 +
  RISCOM8 DRIVER
  S:    Orphan
  F:    Documentation/serial/riscom8.txt
 -F:    drivers/char/riscom8*
 +F:    drivers/staging/tty/riscom8*
  
  ROCKETPORT DRIVER
  P:    Comtrol Corp.
  W:    http://www.comtrol.com
  S:    Maintained
  F:    Documentation/serial/rocket.txt
 -F:    drivers/char/rocket*
 +F:    drivers/tty/rocket*
  
  ROSE NETWORK LAYER
  M:    Ralf Baechle <[email protected]>
@@@ -5343,7 -5257,7 +5343,7 @@@ S:      Maintaine
  F:    drivers/net/wireless/rtl818x/rtl8180/
  
  RTL8187 WIRELESS DRIVER
 -M:    Herton Ronaldo Krzesinski <herton@mandriva.com.br>
 +M:    Herton Ronaldo Krzesinski <herton@canonical.com>
  M:    Hin-Tak Leung <[email protected]>
  M:    Larry Finger <[email protected]>
  L:    [email protected]
@@@ -5399,7 -5313,8 +5399,7 @@@ S:      Supporte
  F:    drivers/s390/crypto/
  
  S390 ZFCP DRIVER
 -M:    Christof Schmitt <[email protected]>
 -M:    Swen Schillig <[email protected]>
 +M:    Steffen Maier <[email protected]>
  M:    [email protected]
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -5433,17 -5348,11 +5433,17 @@@ F:   drivers/media/video/*7146
  F:    include/media/*7146*
  
  SAMSUNG AUDIO (ASoC) DRIVERS
 -M:    Jassi Brar <jassi.brar@samsung.com>
 +M:    Jassi Brar <jassisinghbrar@gmail.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/samsung
  
 +SERIAL DRIVERS
 +M:    Alan Cox <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/tty/serial
 +
  TIMEKEEPING, NTP
  M:    John Stultz <[email protected]>
  M:    Thomas Gleixner <[email protected]>
@@@ -5451,10 -5360,10 +5451,10 @@@ S:   Supporte
  F:    include/linux/clocksource.h
  F:    include/linux/time.h
  F:    include/linux/timex.h
 -F:    include/linux/timekeeping.h
  F:    kernel/time/clocksource.c
  F:    kernel/time/time*.c
  F:    kernel/time/ntp.c
 +F:    drivers/clocksource
  
  TLG2300 VIDEO4LINUX-2 DRIVER
  M:    Huang Shijie <[email protected]>
@@@ -5539,7 -5448,7 +5539,7 @@@ SCx200 CPU SUPPOR
  M:    Jim Cromie <[email protected]>
  S:    Odd Fixes
  F:    Documentation/i2c/busses/scx200_acb
 -F:    arch/x86/kernel/scx200_32.c
 +F:    arch/x86/platform/scx200/
  F:    drivers/watchdog/scx200_wdt.c
  F:    drivers/i2c/busses/scx200*
  F:    drivers/mtd/maps/scx200_docflash.c
@@@ -5606,11 -5515,10 +5606,11 @@@ M:   James Morris <[email protected]
  M:    Eric Paris <[email protected]>
  L:    [email protected] (subscribers-only, general discussion)
  W:    http://selinuxproject.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
 +T:    git git://git.infradead.org/users/eparis/selinux.git
  S:    Supported
  F:    include/linux/selinux*
  F:    security/selinux/
 +F:    scripts/selinux/
  
  APPARMOR SECURITY MODULE
  M:    John Johansen <[email protected]>
@@@ -5636,9 -5544,9 +5636,9 @@@ F:      include/linux/ata.
  F:    include/linux/libata.h
  
  SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
 -M:    Jayamohan Kallickal <jayamohank@serverengines.com>
 +M:    Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
  L:    [email protected]
 -W:    http://www.serverengines.com
 +W:    http://www.emulex.com
  S:    Supported
  F:    drivers/scsi/be2iscsi/
  
@@@ -5684,13 -5592,24 +5684,13 @@@ M:   Robin Holt <[email protected]
  S:    Maintained
  F:    drivers/misc/sgi-xp/
  
 -SHARP LH SUPPORT (LH7952X & LH7A40X)
 -M:    Marc Singer <[email protected]>
 -W:    http://projects.buici.com/arm
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen
 -F:    arch/arm/mach-lh7a40x/
 -F:    drivers/tty/serial/serial_lh7a40x.c
 -F:    drivers/usb/gadget/lh7a40*
 -F:    drivers/usb/host/ohci-lh7a40*
 -
  SIMPLE FIRMWARE INTERFACE (SFI)
  M:    Len Brown <[email protected]>
  L:    [email protected]
  W:    http://simplefirmware.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git
  S:    Supported
 -F:    arch/x86/kernel/*sfi*
 +F:    arch/x86/platform/sfi/
  F:    drivers/sfi/
  F:    include/linux/sfi*.h
  
@@@ -5712,8 -5631,7 +5712,8 @@@ F:      arch/arm/mach-s3c2410/bast-ide.
  F:    arch/arm/mach-s3c2410/bast-irq.c
  
  TI DAVINCI MACHINE SUPPORT
 -M:    Kevin Hilman <[email protected]>
 +M:    Sekhar Nori <[email protected]>
 +M:    Kevin Hilman <[email protected]>
  L:    [email protected] (subscribers-only)
  Q:    http://patchwork.kernel.org/project/linux-davinci/list/
  S:    Supported
@@@ -5788,13 -5706,6 +5788,13 @@@ S:    Supporte
  F:    Documentation/hwmon/emc2103
  F:    drivers/hwmon/emc2103.c
  
 +SMSC SCH5627 HARDWARE MONITOR DRIVER
 +M:    Hans de Goede <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/hwmon/sch5627
 +F:    drivers/hwmon/sch5627.c
 +
  SMSC47B397 HARDWARE MONITOR DRIVER
  M:    "Mark M. Hoffman" <[email protected]>
  L:    [email protected]
@@@ -5856,13 -5767,6 +5856,13 @@@ S:    Maintaine
  F:    drivers/ssb/
  F:    include/linux/ssb/
  
 +BROADCOM SPECIFIC AMBA DRIVER (BCMA)
 +M:    Rafał Miłecki <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/bcma/
 +F:    include/linux/bcma/
 +
  SONY VAIO CONTROL DEVICE DRIVER
  M:    Mattia Dongili <[email protected]>
  L:    [email protected]
@@@ -5892,7 -5796,7 +5892,7 @@@ F:      include/sound
  F:    sound/
  
  SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
 -M:    Liam Girdwood <lrg@slimlogic.co.uk>
 +M:    Liam Girdwood <lrg@ti.com>
  M:    Mark Brown <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git
  L:    [email protected] (moderated for non-subscribers)
@@@ -5968,9 -5872,10 +5968,9 @@@ F:     arch/arm/mach-spear6xx/spear600.
  F:    arch/arm/mach-spear6xx/spear600_evb.c
  
  SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
 -M:    Roger Wolff <[email protected]>
 -S:    Supported
 +S:    Orphan
  F:    Documentation/serial/specialix.txt
 -F:    drivers/char/specialix*
 +F:    drivers/staging/tty/specialix*
  
  SPI SUBSYSTEM
  M:    David Brownell <[email protected]>
@@@ -6001,7 -5906,7 +6001,7 @@@ F:      Documentation/filesystems/spufs.tx
  F:    arch/powerpc/platforms/cell/spufs/
  
  SQUASHFS FILE SYSTEM
- M:    Phillip Lougher <phillip@lougher.demon.co.uk>
+ M:    Phillip Lougher <phillip@squashfs.org.uk>
  L:    [email protected] (subscribers-only)
  W:    http://squashfs.org.uk
  S:    Maintained
@@@ -6015,6 -5920,7 +6015,6 @@@ F:      arch/alpha/kernel/srm_env.
  
  STABLE BRANCH
  M:    Greg Kroah-Hartman <[email protected]>
 -M:    Chris Wright <[email protected]>
  L:    [email protected]
  S:    Maintained
  
@@@ -6143,7 -6049,7 +6143,7 @@@ F:      drivers/mmc/host/tifm_sd.
  F:    include/linux/tifm.h
  
  TI TWL4030 SERIES SOC CODEC DRIVER
 -M:    Peter Ujfalusi <peter.ujfalusi@nokia.com>
 +M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    sound/soc/codecs/twl4030*
@@@ -6151,11 -6057,13 +6151,11 @@@
  TIPC NETWORK LAYER
  M:    Jon Maloy <[email protected]>
  M:    Allan Stephens <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (core kernel code)
 +L:    [email protected] (user apps, general discussion)
  W:    http://tipc.sourceforge.net/
 -W:    http://tipc.cslab.ericsson.net/
 -T:    git git://tipc.cslab.ericsson.net/pub/git/tipc.git
  S:    Maintained
  F:    include/linux/tipc*.h
 -F:    include/net/tipc/
  F:    net/tipc/
  
  TILE ARCHITECTURE
@@@ -6163,9 -6071,8 +6163,9 @@@ M:      Chris Metcalf <[email protected]
  W:    http://www.tilera.com/scm/
  S:    Supported
  F:    arch/tile/
 -F:    drivers/char/hvc_tile.c
 +F:    drivers/tty/hvc/hvc_tile.c
  F:    drivers/net/tile/
 +F:    drivers/edac/tile_edac.c
  
  TLAN NETWORK DRIVER
  M:    Samuel Chessman <[email protected]>
@@@ -6188,7 -6095,7 +6188,7 @@@ S:      Maintaine
  F:    security/tomoyo/
  
  TOPSTAR LAPTOP EXTRAS DRIVER
 -M:    Herton Ronaldo Krzesinski <herton@mandriva.com.br>
 +M:    Herton Ronaldo Krzesinski <herton@canonical.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/platform/x86/topstar-laptop.c
@@@ -6246,7 -6153,6 +6246,7 @@@ TRIVIAL PATCHE
  M:    Jiri Kosina <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git
  S:    Maintained
 +K:    ^Subject:.*(?i)trivial
  
  TTY LAYER
  M:    Greg Kroah-Hartman <[email protected]>
@@@ -6299,8 -6205,7 +6299,8 @@@ M:      Greg Ungerer <[email protected]
  W:    http://www.uclinux.org/
  L:    [email protected]  (subscribers-only)
  S:    Maintained
 -F:    arch/m68knommu/
 +F:    arch/m68k/*/*_no.*
 +F:    arch/m68k/include/asm/*_no.*
  
  UCLINUX FOR RENESAS H8/300 (H8300)
  M:    Yoshinori Sato <[email protected]>
@@@ -6330,13 -6235,6 +6330,13 @@@ F:    drivers/uwb
  F:    include/linux/uwb.h
  F:    include/linux/uwb/
  
 +UNICORE32 ARCHITECTURE:
 +M:    Guan Xuetao <[email protected]>
 +W:    http://mprc.pku.edu.cn/~guanxuetao/linux
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
 +F:    arch/unicore32/
 +
  UNIFDEF
  M:    Tony Finch <[email protected]>
  W:    http://dotat.at/prog/unifdef
@@@ -6505,11 -6403,12 +6505,11 @@@ S:   Maintaine
  F:    drivers/net/usb/rtl8150.c
  
  USB SE401 DRIVER
 -M:    Jeroen Vreeken <[email protected]>
  L:    [email protected]
  W:    http://www.chello.nl/~j.vreeken/se401/
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/video4linux/se401.txt
 -F:    drivers/media/video/se401.*
 +F:    drivers/staging/se401/
  
  USB SERIAL BELKIN F5U103 DRIVER
  M:    William Greathouse <[email protected]>
@@@ -6602,7 -6501,7 +6602,7 @@@ S:      Maintaine
  F:    drivers/usb/host/uhci*
  
  USB "USBNET" DRIVER FRAMEWORK
 -M:    David Brownell <[email protected]>
 +M:    Oliver Neukum <[email protected]>
  L:    [email protected]
  W:    http://www.linux-usb.org/usbnet
  S:    Maintained
@@@ -6659,18 -6558,17 +6659,18 @@@ F:   drivers/media/video/zr364xx.
  
  USER-MODE LINUX (UML)
  M:    Jeff Dike <[email protected]>
 +M:    Richard Weinberger <[email protected]>
  L:    [email protected]
  L:    [email protected]
  W:    http://user-mode-linux.sourceforge.net
  S:    Maintained
 -F:    Documentation/uml/
 +F:    Documentation/virtual/uml/
  F:    arch/um/
  F:    fs/hostfs/
  F:    fs/hppfs/
  
  USERSPACE I/O (UIO)
 -M:    "Hans J. Koch" <hjk@linutronix.de>
 +M:    "Hans J. Koch" <hjk@hansjkoch.de>
  M:    Greg Kroah-Hartman <[email protected]>
  S:    Maintained
  F:    Documentation/DocBook/uio-howto.tmpl
@@@ -6788,7 -6686,7 +6788,7 @@@ F:      drivers/scsi/vmw_pvscsi.
  F:    drivers/scsi/vmw_pvscsi.h
  
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
 -M:    Liam Girdwood <lrg@slimlogic.co.uk>
 +M:    Liam Girdwood <lrg@ti.com>
  M:    Mark Brown <[email protected]>
  W:    http://opensource.wolfsonmicro.com/node/15
  W:    http://www.slimlogic.co.uk/?p=48
@@@ -6810,13 -6708,6 +6810,13 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/hwmon/vt8231.c
  
 +VUB300 USB to SDIO/SD/MMC bridge chip
 +M:    Tony Olech <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/mmc/host/vub300.c
 +
  W1 DALLAS'S 1-WIRE BUS
  M:    Evgeniy Polyakov <[email protected]>
  S:    Maintained
@@@ -6867,7 -6758,7 +6867,7 @@@ F:      drivers/scsi/wd7000.
  WINBOND CIR DRIVER
  M:    David Härdeman <[email protected]>
  S:    Maintained
 -F:    drivers/input/misc/winbond-cir.c
 +F:    drivers/media/rc/winbond-cir.c
  
  WIMAX STACK
  M:    Inaky Perez-Gonzalez <[email protected]>
@@@ -6944,6 -6835,7 +6944,6 @@@ F:      sound/soc/codecs/wm
  
  WORKQUEUE
  M:    Tejun Heo <[email protected]>
 -L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git
  S:    Maintained
  F:    include/linux/workqueue.h
@@@ -6975,25 -6867,6 +6975,25 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/platform/x86
  
 +XEN HYPERVISOR INTERFACE
 +M:    Jeremy Fitzhardinge <[email protected]>
 +M:    Konrad Rzeszutek Wilk <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Supported
 +F:    arch/x86/xen/
 +F:    drivers/*/xen-*front.c
 +F:    drivers/xen/
 +F:    arch/x86/include/asm/xen/
 +F:    include/xen/
 +
 +XEN NETWORK BACKEND DRIVER
 +M:    Ian Campbell <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/xen-netback/*
 +
  XEN PCI SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -7008,6 -6881,18 +7008,6 @@@ S:     Supporte
  F:    arch/x86/xen/*swiotlb*
  F:    drivers/xen/*swiotlb*
  
 -XEN HYPERVISOR INTERFACE
 -M:    Jeremy Fitzhardinge <[email protected]>
 -M:    Konrad Rzeszutek Wilk <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -L:    [email protected]
 -S:    Supported
 -F:    arch/x86/xen/
 -F:    drivers/*/xen-*front.c
 -F:    drivers/xen/
 -F:    arch/x86/include/asm/xen/
 -F:    include/xen/
 -
  XFS FILESYSTEM
  P:    Silicon Graphics Inc
  M:    Alex Elder <[email protected]>
@@@ -7077,6 -6962,20 +7077,6 @@@ M:     "Maciej W. Rozycki" <macro@linux-mip
  S:    Maintained
  F:    drivers/tty/serial/zs.*
  
 -GRE DEMULTIPLEXER DRIVER
 -M:    Dmitry Kozlov <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    net/ipv4/gre.c
 -F:    include/net/gre.h
 -
 -PPTP DRIVER
 -M:    Dmitry Kozlov <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/net/pptp.c
 -W:    http://sourceforge.net/projects/accel-pptp
 -
  THE REST
  M:    Linus Torvalds <[email protected]>
  L:    [email protected]

diff --combined fs/squashfs/cache.c
index 4b5a3fbb1f1f6e3a611063fd0eadfe5f0579c248,7567f7374195d7ff8ca3fff5c6bbe98638259735..f744be98cd5abc8dd6d93cf4a699981491f8e811
--- 1/fs/squashfs/cache.c
--- 2/fs/squashfs/cache.c
+++ b/fs/squashfs/cache.c
@@@ -2,7 -2,7 +2,7 @@@
   * Squashfs - a compressed read only filesystem for Linux
   *
   * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008
-  * Phillip Lougher <phillip@lougher.demon.co.uk>
+  * Phillip Lougher <phillip@squashfs.org.uk>
   *
   * This program is free software; you can redistribute it and/or
   * modify it under the terms of the GNU General Public License
@@@ -29,7 -29,7 +29,7 @@@
   * plus functions layered ontop of the generic cache implementation to
   * access the metadata and fragment caches.
   *
 - * To avoid out of memory and fragmentation isssues with vmalloc the cache
 + * To avoid out of memory and fragmentation issues with vmalloc the cache
   * uses sequences of kmalloced PAGE_CACHE_SIZE buffers.
   *
   * It should be noted that the cache is not used for file datablocks, these
@@@ -104,7 -104,7 +104,7 @@@ struct squashfs_cache_entry *squashfs_c
                        entry = &cache->entry[i];
  
                        /*
 -                       * Initialise choosen cache entry, and fill it in from
 +                       * Initialise chosen cache entry, and fill it in from
                         * disk.
                         */
                        cache->unused--;
@@@ -286,7 -286,7 +286,7 @@@ cleanup
  
  
  /*
 - * Copy upto length bytes from cache entry to buffer starting at offset bytes
 + * Copy up to length bytes from cache entry to buffer starting at offset bytes
   * into the cache entry.  If there's not length bytes then copy the number of
   * bytes available.  In all cases return the number of bytes copied.
   */
@@@ -393,19 -393,36 +393,36 @@@ struct squashfs_cache_entry *squashfs_g
  /*
   * Read a filesystem table (uncompressed sequence of bytes) from disk
   */
- int squashfs_read_table(struct super_block *sb, void *buffer, u64 block,
-       int length)
+ void *squashfs_read_table(struct super_block *sb, u64 block, int length)
  {
        int pages = (length + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
        int i, res;
-       void **data = kcalloc(pages, sizeof(void *), GFP_KERNEL);
-       if (data == NULL)
-               return -ENOMEM;
+       void *table, *buffer, **data;
+ 
+       table = buffer = kmalloc(length, GFP_KERNEL);
+       if (table == NULL)
+               return ERR_PTR(-ENOMEM);
+ 
+       data = kcalloc(pages, sizeof(void *), GFP_KERNEL);
+       if (data == NULL) {
+               res = -ENOMEM;
+               goto failed;
+       }
  
        for (i = 0; i < pages; i++, buffer += PAGE_CACHE_SIZE)
                data[i] = buffer;
+ 
        res = squashfs_read_data(sb, data, block, length |
                SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, length, pages);
+ 
        kfree(data);
-       return res;
+ 
+       if (res < 0)
+               goto failed;
+ 
+       return table;
+ 
+ failed:
+       kfree(table);
+       return ERR_PTR(res);
  }