1. 03 6月, 2013 8 次提交
  2. 24 5月, 2013 11 次提交
    • L
      Merge tag 'gpio-fixes-v3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 514e250f
      Linus Torvalds 提交于
      Pull GPIO fixes from Linus Walleij:
       - An OMAP fix that makes ethernet work again.
       - Fix for build problem when building the MCP23S08 driver as module.
       - IRQ conflicts in the Langwell driver.
       - Fix IRQ coherency issues in the MXS driver.
       - Return correct errorcode on errorpath when removing GPIO chips.
      
      * tag 'gpio-fixes-v3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
        gpio: Don't override the error code in probe error handling
        gpio: mxs: Use set and clear capabilities of the gpio controller
        gpio-langwell: fix irq conflicts when DT is not used
        gpio: mcp23s08: Fix build error when CONFIG_SPI_MASTER=y && CONFIG_I2C=m
        gpio/omap: ensure gpio context is initialised
      514e250f
    • L
      Merge tag 'pci-v3.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · b91fd4d5
      Linus Torvalds 提交于
      Pull PCI updates from Bjorn Helgaas:
       "Here are some more fixes for v3.10.  The Moorestown update broke Intel
        Medfield devices, so I reverted it.  The acpiphp change fixes a
        regression: we broke hotplug notifications to host bridges when we
        split acpiphp into the host-bridge related part and the
        endpoint-related part.
      
        Moorestown
            Revert "x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0"
        Hotplug
            PCI: acpiphp: Re-enumerate devices when host bridge receives Bus Check"
      
      * tag 'pci-v3.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        Revert "x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0"
        PCI: acpiphp: Re-enumerate devices when host bridge receives Bus Check
      b91fd4d5
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 4c0eec03
      Linus Torvalds 提交于
      Pull input updates from Dmitry Torokhov:
       "A few fixups to Wacom and eGalax touchscreen driver"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: wacom - add an eraser to DTH2242/DTK2241
        Input: wacom - add a few new styli for Cintiq series
        Input: wacom - add three new display tablets
        Input: egalax_ts - ABS_MT_POSITION_Y not reported well
      4c0eec03
    • L
      Merge tag 'tty-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · d9795562
      Linus Torvalds 提交于
      Pull tty/serial fixes from Greg Kroah-Hartman:
       "Here are some tty / serial driver fixes for 3.10-rc2.
      
        Nothing huge, although the rocket driver fix looks large, it's just
        moving the code around to fix the reported build issues in it.  Other
        than that, this has the fix for the of-reported lockdep warning from
        the vt layer, as well as some other needed bugfixes.
      
        All of these have been in linux-next for a while"
      
      * tag 'tty-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        tty: mxser: Fix build warning introduced by dfc7b837 (Re: linux-next: build warning after merge of the tty.current tree)
        tty: mxser: fix usage of opmode_ioaddr
        serial: 8250_dw: add ACPI ID for Intel BayTrail
        TTY: Fix tty miss restart after we turn off flow-control
        tty/vt: Fix vc_deallocate() lock order
        TTY: ehv_bytechan: add missing platform_driver_unregister() when module exit
        TTY: rocket, fix more no-PCI warnings
        serial: mcf: missing uart_unregister_driver() on error in mcf_init()
        tty: serial: mpc5xxx: fix error handing in mpc52xx_uart_init()
        serial: samsung: add missing platform_driver_unregister() when module exit
        serial: pl011: protect attribute read from NULL platform data struct
        tty: nwpserial: Pass correct pointer to free_irq()
        serial: 8250_dw: Add valid clk pointer check
      d9795562
    • L
      Merge tag 'staging-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 388c2896
      Linus Torvalds 提交于
      Pull staging driver fixes from Greg Kroah-Hartman:
       "Here are some staging tree driver fixes for 3.10-rc2
      
        The drivers/iio/ changes are here as they are still tied into
        drivers/staging/iio/.
      
        Nothing major, just a number of small bugfixes, and a larger
        documentation update for the ramster code."
      
      * tag 'staging-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (28 commits)
        staging: dwc2: remove compile warning for USB_DWC2_TRACK_MISSED_SOFS
        iio: exynos_adc: fix wrong structure extration in suspend and resume
        iio:common:st: added disable function after read info raw data
        iio: dac: Fix build error when CONFIG_SPI_MASTER=y && CONFIG_I2C=m
        staging:iio:light:tsl2x7x: fix the error handling in tsl2x7x_probe()
        staging/iio/mxs-lradc: fix preenable for multiple buffers
        staging: imx-drm: imx-tve: Check the return value of 'regulator_enable()'
        staging: video: imx: Select VIDEOMODE_HELPERS for parallel display
        staging: ramster: add how-to document
        staging: dwc2: Fix dma-enabled platform devices using a default dma_mask
        staging: vt6656: [bug] Fix missing spin lock in iwctl_siwpower.
        staging: Swap zram and zsmalloc in Kconfig
        staging: android: logger: use kuid_t instead of uid_t
        staging: zcache: Fix incorrect module_param_array types
        staging/solo6x10: depend on CONFIG_FONTS
        staging/drm: imx: add missing dependencies
        staging: ste_rmi4: Suppress 'ignoring return value of ‘regulator_enable()' warning
        staging: sep: fix driver build and kconfig
        staging: nvec: cleanup childs on remove
        staging: nvec: implement unregistering of notifiers
        ...
      388c2896
    • L
      Merge tag 'driver-core-3.10-rc2' of... · c7153d06
      Linus Torvalds 提交于
      Merge tag 'driver-core-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
      
      Pull driver core fixes from Greg Kroah-Hartman:
       "Here are 3 tiny driver core fixes for 3.10-rc2.
      
        A needed symbol export, a change to make it easier to track down
        offending sysfs files with incorrect attributes, and a klist bugfix.
      
        All have been in linux-next for a while"
      
      * tag 'driver-core-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        klist: del waiter from klist_remove_waiters before wakeup waitting process
        driver core: print sysfs attribute name when warning about bogus permissions
        driver core: export subsys_virtual_register
      c7153d06
    • L
      Merge tag 'char-misc-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 5cc0c038
      Linus Torvalds 提交于
      Pull char/misc driver fixes from Greg Kroah-Hartman:
       "Here are some small char/misc driver fixes for 3.10-rc2.
      
        Nothing major here, just a number of fixes for things that people have
        reported, and a MAINTAINERS update for the recent changes for the
        hyperv files that went into 3.10-rc1."
      
      * tag 'char-misc-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        ttyprintk: Fix NULL pointer deref by setting tty_port ops after initializing port
        uio: UIO_DMEM_GENIRQ should depend on HAS_DMA
        MAINTAINERS: update Hyper-V file list
        mei: bus: Reset event_cb when disabling a device
        Drivers: hv: Fix a bug in get_vp_index()
        mei: fix out of array access to me clients array
        Char: lp, protect LPGETSTATUS with port_mutex
        dummy-irq: require the user to specify an IRQ number
      5cc0c038
    • L
      Merge tag 'usb-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · b6419406
      Linus Torvalds 提交于
      Pull USB fixes from Greg Kroah-Hartman:
       "Here are a number of tiny USB bugfixes / new device ids for 3.10-rc2
      
        The majority of these are USB gadget fixes, but they are all small.
        Other than that, some USB host controller fixes, and USB serial driver
        fixes for problems reported with them.
      
        Also hopefully a fixed up USB_OTG Kconfig dependancy, that one seems
        to be almost impossible to get right for all of the different
        platforms these days."
      
      * tag 'usb-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (56 commits)
        USB: cxacru: potential underflow in cxacru_cm_get_array()
        USB: ftdi_sio: Add support for Newport CONEX motor drivers
        USB: option: add device IDs for Dell 5804 (Novatel E371) WWAN card
        usb: ohci: fix goto wrong tag in err case
        usb: isp1760-if: fix memleak when platform_get_resource fail
        usb: ehci-s5p: fix memleak when fallback to pdata
        USB: serial: clean up chars_in_buffer
        USB: ti_usb_3410_5052: fix chars_in_buffer overhead
        USB: io_ti: fix chars_in_buffer overhead
        USB: ftdi_sio: fix chars_in_buffer overhead
        USB: ftdi_sio: clean up get_modem_status
        USB: serial: add generic wait_until_sent implementation
        USB: serial: add wait_until_sent operation
        USB: set device dma_mask without reference to global data
        USB: Blacklisted Cinterion's PLxx WWAN Interface
        usb: option: Add Telewell TW-LTE 4G
        USB: EHCI: remove bogus #error
        USB: reset resume quirk needed by a hub
        USB: usb-stor: realtek_cr: Fix compile error
        usb, chipidea: fix link error when USB_EHCI_HCD is a module
        ...
      b6419406
    • L
      Merge git://git.kernel.org/pub/scm/virt/kvm/kvm · 72dd4e79
      Linus Torvalds 提交于
      Pull kvm bugfixes from Gleb Natapov.
      
      * git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM/MIPS32: Wrap calls to gfn_to_pfn() with srcu_read_lock/unlock()
        KVM/MIPS32: Move include/asm/kvm.h => include/uapi/asm/kvm.h since it is a user visible API.
        KVM: take over co-maintainership from Marcelo, fix MAINTAINERS entry
      72dd4e79
    • R
      lib: make iovec obj instead of lib · b4d3ba33
      Randy Dunlap 提交于
      Fix build error io vmw_vmci.ko when CONFIG_VMWARE_VMCI=m by chaning
      iovec.o from lib-y to obj-y.
      
        ERROR: "memcpy_toiovec" [drivers/misc/vmw_vmci/vmw_vmci.ko] undefined!
        ERROR: "memcpy_fromiovec" [drivers/misc/vmw_vmci/vmw_vmci.ko] undefined!
      Signed-off-by: NRandy Dunlap <rdunlap@infradead.org>
      Acked-by: NRusty Russell <rusty@rustcorp.com.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b4d3ba33
    • P
      Input: wacom - add an eraser to DTH2242/DTK2241 · c73a1afb
      Ping Cheng 提交于
      plus send begin and end of express keys events for
      Cintiq 13HD and DTH2242/DTK2241
      Signed-off-by: NPing Cheng <pingc@wacom.com>
      Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>
      c73a1afb
  3. 23 5月, 2013 11 次提交
  4. 22 5月, 2013 10 次提交