Merge tag 'staging-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

Pull staging fixes from Greg KH:
 "Here are some tiny drivers/staging/ fixes for 3.11-rc3

  A number of bugfixes, all pretty tiny, but resolve issues that have
  been reported (the kstrtos32 change fixes a data corruption problem
  that Dan found).  And a MAINTAINERS file update for the comedi
  drivers"

* tag 'staging-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  MAINTAINERS: Update the list of maintainers for staging/comedi driver.
  staging: tidspbridge: replace strict_strtol() with kstrtos32()
  staging: android: logger: Correct write offset reset on error
  staging: zram: protect zram_reset_device() call
  staging: gdm72xx: potential use after free in send_qos_list()
  staging: drm/imx: drop "select OF_VIDEOMODE"
  staging: frontier: use after free in disconnect()
  staging: comedi: fix a race between do_cmd_ioctl() and read/write
  staging: comedi: COMEDI_CANCEL ioctl should wake up read/write

diff --combined MAINTAINERS
index f817ae196a8ef6eeb71ec7f05e760a9c2ded0e41,6ddb33d5c653e931a18ec58c5696927fbc654e80..a26b10e52aea18cf39b61095cc563cd940ff1dac
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1642,7 -1642,7 +1642,7 @@@ S:      Maintaine
  F:    drivers/net/hamradio/baycom*
  
  BCACHE (BLOCK LAYER CACHE)
 -M:    Kent Overstreet <koverstreet@google.com>
 +M:    Kent Overstreet <kmo@daterainc.com>
  L:    linux-bcache@vger.kernel.org
  W:    http://bcache.evilpiepirate.org
  S:    Maintained:
@@@ -3346,7 -3346,7 +3346,7 @@@ F:      Documentation/firmware_class
  F:    drivers/base/firmware*.c
  F:    include/linux/firmware.h
  
 -FLASHSYSTEM DRIVER (IBM FlashSystem 70/80 PCI SSD Flash Card)
 +FLASH ADAPTER DRIVER (IBM Flash Adapter 900GB Full Height PCI Flash Card)
  M:    Joshua Morris <josh.h.morris@us.ibm.com>
  M:    Philip Kelleher <pjk1939@linux.vnet.ibm.com>
  S:    Maintained
@@@ -3622,9 -3622,11 +3622,9 @@@ F:     drivers/isdn/gigaset
  F:    include/uapi/linux/gigaset_dev.h
  
  GPIO SUBSYSTEM
 -M:    Grant Likely <grant.likely@linaro.org>
  M:    Linus Walleij <linus.walleij@linaro.org>
  S:    Maintained
  L:    linux-gpio@vger.kernel.org
 -T:    git git://git.secretlab.ca/git/linux-2.6.git
  F:    Documentation/gpio.txt
  F:    drivers/gpio/
  F:    include/linux/gpio*
@@@ -4470,6 -4472,8 +4470,6 @@@ F:      drivers/irqchip
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
  M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
 -M:    Grant Likely <grant.likely@linaro.org>
 -T:    git git://git.secretlab.ca/git/linux-2.6.git irqdomain/next
  S:    Maintained
  F:    Documentation/IRQ-domain.txt
  F:    include/linux/irqdomain.h
@@@ -4986,7 -4990,7 +4986,7 @@@ F:      arch/powerpc/platforms/44x
  
  LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
  L:    linuxppc-dev@lists.ozlabs.org
 -S:    Unmaintained
 +S:    Orphan
  F:    arch/powerpc/*/*virtex*
  F:    arch/powerpc/*/*/*virtex*
  
@@@ -5882,7 -5886,7 +5882,7 @@@ OMAP DEVICE TREE SUPPOR
  M:    Benoît Cousson <b-cousson@ti.com>
  M:    Tony Lindgren <tony@atomide.com>
  L:    linux-omap@vger.kernel.org
 -L:    devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers)
 +L:    devicetree@vger.kernel.org
  S:    Maintained
  F:    arch/arm/boot/dts/*omap*
  F:    arch/arm/boot/dts/*am3*
@@@ -6046,28 -6050,17 +6046,28 @@@ F:   drivers/i2c/busses/i2c-ocores.
  OPEN FIRMWARE AND FLATTENED DEVICE TREE
  M:    Grant Likely <grant.likely@linaro.org>
  M:    Rob Herring <rob.herring@calxeda.com>
 -L:    devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers)
 +L:    devicetree@vger.kernel.org
  W:    http://fdt.secretlab.ca
  T:    git git://git.secretlab.ca/git/linux-2.6.git
  S:    Maintained
 -F:    Documentation/devicetree
 -F:    drivers/of
 +F:    drivers/of/
  F:    include/linux/of*.h
 -F:    scripts/dtc
 +F:    scripts/dtc/
  K:    of_get_property
  K:    of_match_table
  
 +OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
 +M:    Rob Herring <rob.herring@calxeda.com>
 +M:    Pawel Moll <pawel.moll@arm.com>
 +M:    Mark Rutland <mark.rutland@arm.com>
 +M:    Stephen Warren <swarren@wwwdotorg.org>
 +M:    Ian Campbell <ian.campbell@citrix.com>
 +L:    devicetree@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/
 +F:    arch/*/boot/dts/
 +F:    include/dt-bindings/
 +
  OPENRISC ARCHITECTURE
  M:    Jonas Bonn <jonas@southpole.se>
  W:    http://openrisc.net
@@@ -7753,6 -7746,7 +7753,6 @@@ F:      drivers/clk/spear
  
  SPI SUBSYSTEM
  M:    Mark Brown <broonie@kernel.org>
 -M:    Grant Likely <grant.likely@linaro.org>
  L:    linux-spi@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
  Q:    http://patchwork.kernel.org/project/spi-devel-general/list/
@@@ -7818,7 -7812,7 +7818,7 @@@ F:      drivers/staging/asus_oled
  
  STAGING - COMEDI
  M:    Ian Abbott <abbotti@mev.co.uk>
- M:    Mori Hess <fmhess@users.sourceforge.net>
+ M:    H Hartley Sweeten <hsweeten@visionengravers.com>
  S:    Odd Fixes
  F:    drivers/staging/comedi/
  
@@@ -9294,7 -9288,7 +9294,7 @@@ S:      Maintaine
  F:    drivers/net/ethernet/xilinx/xilinx_axienet*
  
  XILINX SYSTEMACE DRIVER
 -S:    Unmaintained
 +S:    Orphan
  F:    drivers/block/xsysace.c
  
  XILINX UARTLITE SERIAL DRIVER