1. 16 Aug, 2013 3 commits
  2. 14 Aug, 2013 2 commits
  3. 11 Aug, 2013 1 commit
  4. 07 Aug, 2013 2 commits
  5. 04 Aug, 2013 7 commits
  6. 31 Jul, 2013 3 commits
  7. 30 Jul, 2013 9 commits
    • Afzal Mohammed's avatar
      ARM: OMAP2+: hwmod: AM335x: fix cpgmac address space · 50c2a3a1
      Afzal Mohammed authored
      Register target address to be used for cpgmac is the second device
      address space. By default, hwmod picks first address space (0th index)
      for register target.
      
      With removal of address space from hwmod and using DT instead, cpgmac
      is getting wrong address space for register target.
      
      Fix it by indicating the address space to be used for register target.
      Signed-off-by: default avatarAfzal Mohammed <afzal@ti.com>
      Tested-by: default avatarMugunthan V N <mugunthanvnm@ti.com>
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      50c2a3a1
    • Afzal Mohammed's avatar
      ARM: OMAP2+: hwmod: rt address space index for DT · 130142d9
      Afzal Mohammed authored
      Address space is being removed from hwmod database and DT information
      in <reg> property is being used. Currently the 0th index of device
      address space is used to map for register target address. This is not
      always true, eg. cpgmac has it's sysconfig in second address space.
      
      Handle it by specifying index of device address space to be used for
      register target. As default value of this field would be zero with
      static initialization, existing behaviour of using first address space
      for register target while using DT would be kept as such.
      Signed-off-by: default avatarAfzal Mohammed <afzal@ti.com>
      Tested-by: default avatarMugunthan V N <mugunthanvnm@ti.com>
      [paul@pwsan.com: use u8 rather than int to save memory]
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      130142d9
    • Rajendra Nayak's avatar
      ARM: OMAP2+: Sync hwmod state with the pm_runtime and omap_device state · 7268032d
      Rajendra Nayak authored
      Some hwmods which are marked with HWMOD_INIT_NO_IDLE are left in enabled
      state post setup(). When a omap_device gets created for such hwmods
      make sure the omap_device and pm_runtime states are also in sync for such
      hwmods by doing a omap_device_enable() and pm_runtime_set_active() for the
      device.
      Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
      Tested-by: default avatarMark Jackson <mpfj-list@newflow.co.uk>
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      7268032d
    • Rajendra Nayak's avatar
      ARM: OMAP2+: Avoid idling memory controllers with no drivers · f66e329d
      Rajendra Nayak authored
      Memory controllers in OMAP (like GPMC and EMIF) have the hwmods marked with
      HWMOD_INIT_NO_IDLE and are left in enabled state post initial setup.
      
      Even if they have drivers missing, avoid idling them as part of
      omap_device_late_idle()
      Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
      Tested-by: default avatarMark Jackson <mpfj-list@newflow.co.uk>
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      f66e329d
    • Rajendra Nayak's avatar
      ARM: OMAP2+: hwmod: Fix a crash in _setup_reset() with DEBUG_LL · 7dedd346
      Rajendra Nayak authored
      With commit '82702ea1' "ARM: OMAP2+:
      Fix serial init for device tree based booting" stubbing out
      omap_serial_early_init() for Device tree based booting, there was a
      crash observed on AM335x based devices when hwmod does a
      _setup_reset() early at boot.
      
      This was rootcaused to hwmod trying to reset console uart while
      earlycon was using it.  The way to tell hwmod not to do this is to
      specify the HWMOD_INIT_NO_RESET flag, which were infact set by the
      omap_serial_early_init() function by parsing the cmdline to identify
      the console device.
      
      Parsing the cmdline to identify the uart used by earlycon itself seems
      broken as there is nothing preventing earlycon to use a different one.
      
      This patch, instead, attempts to populate the requiste flags for hwmod
      based on the CONFIG_DEBUG_OMAPxUARTy FLAGS. This gets rid of the need
      for cmdline parsing in the DT as well as non-DT cases to identify the
      uart used by earlycon.
      Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
      Reported-by: default avatarMark Jackson <mpfj-list@newflow.co.uk>
      Reported-by: default avatarVaibhav Bedia <vaibhav.bedia@ti.com>
      Tested-by: default avatarMark Jackson <mpfj-list@newflow.co.uk>
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      7dedd346
    • Nishanth Menon's avatar
      ARM: dts: omap5-uevm: update optional/unused regulator configurations · bd3c5544
      Nishanth Menon authored
      commit e00c27ef
      (ARM: dts: OMAP5: Add Palmas MFD node and regulator nodes)
      introduced regulator entries for OMAP5uEVM.
      
      However, The regulator information is based on an older temporary
      pre-production board variant and does not reflect production board
      750-2628-XXX boards.
      
      The following optional/unused regulators can be updated:
      
      - SMPS9 supplies TWL6040 over VDDA_2v1_AUD. This regulator needs to be
      enabled only when audio is active. Since it does not come active by
      default, it does not require "always-on" or "boot-on".
      
      - LDO2 and LDO8 do not go to any peripheral or connector on the board.
      Further, these unused regulators should have been 2.8V for LDO2 and
      3.0V for LDO8. Mark these LDOs as disabled in the dts until needed.
      Reported-by: default avatarMarc Jüttner <m-juettner@ti.com>
      Signed-off-by: default avatarNishanth Menon <nm@ti.com>
      Acked-by: default avatarJ Keerthy <j-keerthy@ti.com>
      Acked-by: default avatarBenoit Cousson <benoit.cousson@gmail.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      bd3c5544
    • Nishanth Menon's avatar
      ARM: dts: omap5-uevm: fix regulator configurations mandatory for SoC · e18235a6
      Nishanth Menon authored
      commit e00c27ef
      (ARM: dts: OMAP5: Add Palmas MFD node and regulator nodes)
      introduced regulator entries for OMAP5uEVM.
      
      However, The regulator information is based on an older temporary
      pre-production board variant and does not reflect production board
      750-2628-XXX boards.
      
      The following fixes are hence mandatory to ensure right voltage is
      supplied to key OMAP5 SoC voltage rails:
      
      - LDO1 supplies VDDAPHY_CAM which is OMAP5's vdda_csiporta/b/c. This
      can only be supplied at 1.5V or 1.8V and we currently supply 2.8V.
      
      To prevent any potential device damage risk, use the specified
      1.5V-1.8V supply.
      
      Remove 'always-on' and 'boot-on' settings here as it is
      a 'on need' supply to SoC IP and is not enabled by PMIC by
      default at boot.
      
      - LDO3 supplies Low Latency Interface(LLI) hardware module which is a
      special hardware to communicate with Modem. However since uEVM is
      not setup by default for this communication, this should be disabled
      by default.
      
      Further, vdda_lli is supposed to be 1.5V and not 3V.
      
      - LDO4 supplies VDDAPHY_DISP which is vdda_dsiporta/c/vdda_hdmi
      
      This can only be supplied at 1.5V or 1.8V and we currently
      supply 2.2V.
      
      To prevent any potential device damage risk, use the specified
      1.5V-1.8V supply.
      
      Remove 'always-on' and 'boot-on' settings here as it is a 'on need'
      supply to SoC IP and is not enabled by PMIC by default at boot.
      
      - LDO6 supplies the board specified VDDS_1V2_WKUP supply going to
      ldo_emu_wkup/vdds_hsic. To stay within the SoC specification supply
      1.2V instead of 1.5V.
      
      - LDO7 supplies VDD_VPP which is vpp1. This is currently configured for
      1.5V which as per data manual "A pulse width of 1000 ns and an amplitude
      of 2V is required to program each eFuse bit. Otherwise, VPP1 must not
      be supplied".
      
      So, fix the voltage to 2V. and disable the supply since we have no plans
      of programming efuse bits - it can only be done once - in factory.
      
      Further it is not enabled by default by PMIC so, 'boot-on' must be
      removed, and the 'always-on' needs to be removed to achieve pulsing
      if efuse needs to be programmed.
      
      - LDO9 supplies the board specified vdds_sdcard supply going within SoC
      specification of 1.8V or 3.0V. Further the supply is controlled by
      switch enabled by REGEN3. So, introduce REGEN3 and map sdcard slot to
      be powered by LDO9. Remove 'always-on' allowing the LDO to be disabled
      on need basis.
      Reported-by: default avatarMarc Jüttner <m-juettner@ti.com>
      Signed-off-by: default avatarNishanth Menon <nm@ti.com>
      Acked-by: default avatarJ Keerthy <j-keerthy@ti.com>
      Acked-by: default avatarBenoit Cousson <benoit.cousson@gmail.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      e18235a6
    • Nishanth Menon's avatar
      ARM: dts: omap5-uevm: document regulator signals used on the actual board · 3709d323
      Nishanth Menon authored
      commit e00c27ef
      (ARM: dts: OMAP5: Add Palmas MFD node and regulator nodes)
      introduced regulator entries for OMAP5uEVM.
      
      However, currently we use the Palmas regulator names which is used for
      different purposes on uEVM. Document the same based on 750-2628-XXX
      boards - which is meant to be supported by this dts.
      Reported-by: default avatarMarc Jüttner <m-juettner@ti.com>
      Signed-off-by: default avatarNishanth Menon <nm@ti.com>
      Acked-by: default avatarJ Keerthy <j-keerthy@ti.com>
      Acked-by: default avatarBenoit Cousson <benoit.cousson@gmail.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      3709d323
    • Kukjin Kim's avatar
      ARM: SAMSUNG: fix to support for missing cpu specific map_io · 35f8550c
      Kukjin Kim authored
      Since commit 7ed76e08 (ARM: EXYNOS: Fix low level debug support)
      map_io() is not needed for exynos5440 so need to fix to lookup
      cpu which using map_io(). Without this, kernel boot log complains
      'CPU EXYNOS5440 support not enabled' on exynos5440 and panic().
      Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
      35f8550c
  8. 29 Jul, 2013 4 commits
    • Linus Torvalds's avatar
      Linux 3.11-rc3 · 5ae90d8e
      Linus Torvalds authored
      5ae90d8e
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-for-v3.11-2' of... · 76d25a5f
      Linus Torvalds authored
      Merge tag 'pinctrl-for-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
      
      Pull pin control fixes from Linus Walleij:
       - Driver fixes for AM33xx, SIRF and PFC pin controllers
       - Fix a compile warning from the pinctrl single-register driver
       - Fix a little nasty memory leak
      
      * tag 'pinctrl-for-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinctrl: fix a memleak when freeing maps
        pinctrl: pinctrl-single: fix compile warning when no CONFIG_PM
        pinctrl: sh-pfc: fix SDHI0 VccQ regulator on sh73a0 with DT
        arm/dts: sirf: fix the pingroup name mismatch between drivers and dts
        pinctrl: sirf: add usp0_uart_nostreamctrl pin group for usp-uart without flowctrl
        pinctrl: sirf: fix the pin number and mux bit for usp0
        pinctrl: am33xx dt binding: correct include path
      76d25a5f
    • Linus Torvalds's avatar
      Merge tag 'trace-fixes-3.11-rc2' of... · 6803f37e
      Linus Torvalds authored
      Merge tag 'trace-fixes-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull tracing fixes from Steven Rostedt:
       "Oleg is working on fixing a very tight race between opening a event
        file and deleting that event at the same time (both must be done as
        root).
      
        I also found a bug while testing Oleg's patches which has to do with a
        race with kprobes using the function tracer.
      
        There's also a deadlock fix that was introduced with the previous
        fixes"
      
      * tag 'trace-fixes-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Remove locking trace_types_lock from tracing_reset_all_online_cpus()
        ftrace: Add check for NULL regs if ops has SAVE_REGS set
        tracing: Kill trace_cpu struct/members
        tracing: Change tracing_fops/snapshot_fops to rely on tracing_get_cpu()
        tracing: Change tracing_entries_fops to rely on tracing_get_cpu()
        tracing: Change tracing_stats_fops to rely on tracing_get_cpu()
        tracing: Change tracing_buffers_fops to rely on tracing_get_cpu()
        tracing: Change tracing_pipe_fops() to rely on tracing_get_cpu()
        tracing: Introduce trace_create_cpu_file() and tracing_get_cpu()
      6803f37e
    • Linus Torvalds's avatar
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 561d9e81
      Linus Torvalds authored
      Pull SCSI fixes from James Bottomley:
       "This is five bug fixes, two of which fix long standing problems
        causing crashes (sd and mvsas).  The remaining three are hung (isci
        race) or lost (qla2xxx, isci) devices"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        [SCSI] isci: fix breakage caused by >16byte CDB patch
        [SCSI] mvsas: Fix kernel panic on tile due to unaligned data access
        [SCSI] sd: fix crash when UA received on DIF enabled device
        [SCSI] qla2xxx: Properly set the tagging for commands.
        [SCSI] isci: Fix a race condition in the SSP task management path
      561d9e81
  9. 26 Jul, 2013 9 commits
    • Rohit Vaswani's avatar
      ARM: msm: Consolidate gpiomux for older architectures · 8fd62389
      Rohit Vaswani authored
      Msm gpiomux can be used only for 7x30 and 8x50.
      Prevent compilation and fix build issues on 7X00, 8X60 and 8960.
      Signed-off-by: default avatarRohit Vaswani <rvaswani@codeaurora.org>
      Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
      8fd62389
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 6c504ecf
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "This is just a regular fixes pull apart from the qxl one, it has
        radeon and intel bits in it,
      
        The intel fixes are for a regression with the RC6 fix and a 3.10 hdmi
        regression, whereas radeon is more DPM fixes, a few lockup fixes and
        some rn50/r100 DAC fixes"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/radeon/dpm: fix r600_enable_sclk_control()
        drm/radeon/dpm: implement force performance levels for rv6xx
        drm/radeon/dpm: fix displaygap programming on rv6xx
        drm/radeon/dpm: fix a typo in the rv6xx mclk setup
        drm/i915: initialize gt_lock early with other spin locks
        drm/i915: fix hdmi portclock limits
        drm/radeon: fix combios tables on older cards
        drm/radeon: improve dac adjust heuristics for legacy pdac
        drm/radeon: Another card with wrong primary dac adj
        drm/radeon: fix endian issues with DP handling (v3)
        drm/radeon/vm: only align the pt base to 32k
        drm/radeon: wait for 3D idle before using CP DMA
      6c504ecf
    • Linus Torvalds's avatar
      Merge branch 'qxl-fixes' of git://people.freedesktop.org/~airlied/linux · 2408c2e5
      Linus Torvalds authored
      Pull qxl drm fixes from Dave Airlie:
       "Okay as I warned, the qxl driver was running a bit free and loose with
        its ttm object reservations and the new lockdep enabled reservation
        tracking shone a bright light into it, it also with the new
        reservations mutexes hits a possible deadlock during boot.
      
        The first patch is a real fix to render the console correctly as the
        driver used to just drop irq renderering as too hard, this also fixes
        a sleeping while atomic warning.
      
        The other two patches are the big ugly ones that redo how the driver
        allocates objects and reserves them and makes things all work
        properly, I've tested this in a VM, and compared to the current code
        which hits a lockdep warning and the sleep while atomic warning before
        failing.
      
        So sorry this is coming in late, I should have tested qxl before
        merging the mutex code, but I'd rather just fix qxl with this than
        revert the reservations code at this point"
      
      * 'qxl-fixes' of git://people.freedesktop.org/~airlied/linux:
        qxl: convert qxl driver to proper use for reservations
        qxl: allow creation of pre-pinned objects and use for releases.
        drm/qxl: add delayed fb operations
      2408c2e5
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 0f746650
      Linus Torvalds authored
      Pull ACPI and power management fixes from Rafael Wysocki:
       "These are just two fixes, a revert of the would-be backlight fix that
        didn't work and an intel_pstate fix for two problems related to
        maximum P-state selection.
      
        Specifics:
      
         - Revert of the ACPI video commit that I hoped would help fix
           backlight problems related to Windows 8 compatibility on some
           systems.  Unfortunately, it turned out to cause problems to happen
           too.
      
         - Fix for two problems in intel_pstate, a possible failure to respond
           to a load change on a quiet system and a possible failure to select
           the highest available P-state on some systems.  From Dirk
           Brandewie"
      
      * tag 'pm+acpi-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        Revert "ACPI / video / i915: No ACPI backlight if firmware expects Windows 8"
        cpufreq / intel_pstate: Change to scale off of max P-state
      0f746650
    • Linus Torvalds's avatar
      Merge tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 · a9b5f023
      Linus Torvalds authored
      Pull arm64 fixes from Catalin Marinas:
       - Stack size increased to 16K (similar to other 64-bit architectures)
       - Additional cache flushing for secondary CPUs boot mode
      
      * tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
        arm64: Change kernel stack size to 16K
        arm64: Fix definition of arm_pm_restart to match the declaration
        arm64: virt: ensure visibility of __boot_cpu_mode
      a9b5f023
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · fef36a7a
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "This is a largeish batch of fixes, mostly because I missed -rc2 due to
        travel/vacation.  So in number these are a bit more than ideal unless
        you amortize them over two -rcs.
      
        Quick breakdown:
         - Defconfig updates
           - Making multi_v7_defconfig useful on more hardware to encourage
             single-image usage
           - Davinci and nomadik updates due to new code merged this merge
             window
         - Fixes for UART on Samsung platforms, both PM and clock-related
         - A handful of warning fixes from defconfig builds, including for
           max8925 backlight and pxamci (both with appropriate acks)
         - Exynos5440 fixes for LPAE configuration, PM
         - ...plus a bunch of other smaller changes all over the place
      
        I expect to switch to regressions-or-severe-bugs-only fixes from here
        on out"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (37 commits)
        mfd: max8925: fix dt code for backlight
        ARM: omap5: Only select errata 798181 if SMP
        ARM: EXYNOS: Update CONFIG_ARCH_NR_GPIO for Exynos
        ARM: EXYNOS: Fix low level debug support
        ARM: SAMSUNG: Save/restore only selected uart's registers
        ARM: SAMSUNG: Add SAMSUNG_PM config option to select pm
        ARM: S3C24XX: Add missing clkdev entries for s3c2440 UART
        ARM: multi_v7_defconfig: Select USB chipidea driver
        ARM: pxa: propagate errors from regulator_enable() to pxamci
        ARM: zynq: fix compilation warning
        ARM: keystone: fix compilation warning
        ARM: highbank: Only touch common coherency control register fields
        ARM: footbridge: fix overlapping PCI mappings
        dmaengine: shdma: fix a build failure on platforms with no DMA support
        ARM: STi: Set correct ARM ERRATAs.
        ARM: dts: STi: Fix pinconf setup for STiH416 serial2
        ARM: nomadik: configure for NO_HZ and HRTIMERS
        ARM: nomadik: update defconfig base
        ARM: nomadik: Update MMC defconfigs
        ARM: davinci: defconfig: enable EDMA driver
        ...
      fef36a7a
    • Linus Torvalds's avatar
      Merge tag 'usb-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · db8cbfad
      Linus Torvalds authored
      Pull USB fixes from Greg KH:
       "Here are a number of USB fixes for 3.11-rc3.
      
        Lots of little things, nothing major.  A number of new device ids,
        build fixes for DMA, and a bunch of other minor things.  All of these
        have been in the linux-next tree"
      
      * tag 'usb-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (40 commits)
        usb: Clear both buffers when clearing a control transfer TT buffer.
        usb/gadget: free opts struct on error recovery
        USB: mos7840: fix memory leak in open
        usb: serial: option.c: remove ONDA MT825UP product ID fromdriver
        usb: serial: option: add Olivetti Olicard 200
        usb: serial: option: blacklist ONDA MT689DC QMI interface
        xhci: fix null pointer dereference on ring_doorbell_for_active_rings
        usb: host: xhci: Enable XHCI_SPURIOUS_SUCCESS for all controllers with xhci 1.0
        usb: fix build warning in pci-quirks.h when CONFIG_PCI is not enabled
        usb: xhci: Mark two functions __maybe_unused
        xhci: Avoid NULL pointer deref when host dies.
        usb: serial: option: Add ONYX 3G device support
        USB: ti_usb_3410_5052: fix dynamic-id matching
        usb: option: add TP-LINK MA260
        USB: option: add D-Link DWM-152/C1 and DWM-156/C1
        USB: EHCI: Fix resume signalling on remote wakeup
        USB: cp210x: add MMB and PI ZigBee USB Device Support
        usb: cp210x support SEL C662 Vendor/Device
        USB: option: append Petatel NP10T device to GSM modems list
        USB: misc: Add Manhattan Hi-Speed USB DVI Converter to sisusbvga
        ...
      db8cbfad
    • Linus Torvalds's avatar
      Merge tag 'tty-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · ab20fb81
      Linus Torvalds authored
      Pull tty/serial fixes from Greg KH:
       "Here are 3 fixes for TTY and serial issues that have been reported.
        Nothing huge, but nice to get fixed"
      
      * tag 'tty-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        serial: tegra: correct help message in Kconfig from 'ttyHS' to 'ttyTHS'
        tty/8250_early: Don't truncate last character of options
        TTY: snyclinkmp: calculating wrong addresses
      ab20fb81
    • Linus Torvalds's avatar
      Merge tag 'staging-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · f19e6c69
      Linus Torvalds authored
      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
      f19e6c69