1. 27 Nov, 2013 16 commits
  2. 21 Nov, 2013 1 commit
  3. 20 Nov, 2013 6 commits
  4. 19 Nov, 2013 9 commits
  5. 18 Nov, 2013 8 commits
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · 27b5c3f3
      Linus Torvalds authored
      Pull watchdog changes from Wim Van Sebroeck:
       - addition of MOXA ART watchdog driver (moxart_wdt)
       - addition of CSR SiRFprimaII and SiRFatlasVI watchdog driver
         (sirfsoc_wdt)
       - addition of ralink watchdog driver (rt2880_wdt)
       - various fixes and cleanups (__user annotation, ioctl return codes,
         removal of redundant of_match_ptr, removal of unnecessary
         amba_set_drvdata(), use allocated buffer for usb_control_msg, ...)
       - removal of MODULE_ALIAS_MISCDEV statements
       - watchdog related DT bindings
       - first set of improvements on the w83627hf_wdt driver
      
      * git://www.linux-watchdog.org/linux-watchdog: (26 commits)
        watchdog: w83627hf: Use helper functions to access superio registers
        watchdog: w83627hf: Enable watchdog device only if not already enabled
        watchdog: w83627hf: Enable watchdog only once
        watchdog: w83627hf: Convert to watchdog infrastructure
        watchdog: omap_wdt: raw read and write endian fix
        watchdog: sirf: don't depend on dummy value of CLOCK_TICK_RATE
        watchdog: pcwd_usb: overflow in usb_pcwd_send_command()
        watchdog: rt2880_wdt: fix return value check in rt288x_wdt_probe()
        watchdog: watchdog_core: Fix a trivial typo
        watchdog: dw: Enable OF support for DW watchdog timer
        watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
        watchdog: ts72xx_wdt: Propagate return value from timeout_to_regval
        watchdog: pcwd_usb: Use allocated buffer for usb_control_msg
        watchdog: sp805_wdt: Remove unnecessary amba_set_drvdata()
        watchdog: sirf: add watchdog driver of CSR SiRFprimaII and SiRFatlasVI
        watchdog: Remove redundant of_match_ptr
        watchdog: ts72xx_wdt: cleanup return codes in ioctl
        documentation/devicetree: Move DT bindings from gpio to watchdog
        watchdog: add ralink watchdog driver
        watchdog: Add MOXA ART watchdog driver
        ...
      27b5c3f3
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 13509c3a
      Linus Torvalds authored
      Pull i2c changes from Wolfram Sang:
       - new drivers for exynos5, bcm kona, and st micro
       - bigger overhauls for drivers mxs and rcar
       - typical driver bugfixes, cleanups, improvements
       - got rid of the superfluous 'driver' member in i2c_client struct This
         touches a few drivers in other subsystems.  All acked.
      
      * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (38 commits)
        i2c: bcm-kona: fix error return code in bcm_kona_i2c_probe()
        i2c: i2c-eg20t: do not print error message in syslog if no ACK received
        i2c: bcm-kona: Introduce Broadcom I2C Driver
        i2c: cbus-gpio: Fix device tree binding
        i2c: wmt: add missing clk_disable_unprepare() on error
        i2c: designware: add new ACPI IDs
        i2c: i801: Add Device IDs for Intel Wildcat Point-LP PCH
        i2c: exynos5: Remove incorrect clk_disable_unprepare
        i2c: i2c-st: Add ST I2C controller
        i2c: exynos5: add High Speed I2C controller driver
        i2c: rcar: fixup rcar type naming
        i2c: scmi: remove some bogus NULL checks
        i2c: sh_mobile & rcar: Enable the driver on all ARM platforms
        i2c: sh_mobile: Convert to clk_prepare/unprepare
        i2c: mux: gpio: use reg value for i2c_add_mux_adapter
        i2c: mux: gpio: use gpio_set_value_cansleep()
        i2c: Include linux/of.h header
        i2c: mxs: Fix PIO mode on i.MX23
        i2c: mxs: Rework the PIO mode operation
        i2c: mxs: distinguish i.MX23 and i.MX28 based I2C controller
        ...
      13509c3a
    • Linus Torvalds's avatar
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 1ea406c0
      Linus Torvalds authored
      Pull infiniband/rdma updates from Roland Dreier:
       - Re-enable flow steering verbs with new improved userspace ABI
       - Fixes for slow connection due to GID lookup scalability
       - IPoIB fixes
       - Many fixes to HW drivers including mlx4, mlx5, ocrdma and qib
       - Further improvements to SRP error handling
       - Add new transport type for Cisco usNIC
      
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (66 commits)
        IB/core: Re-enable create_flow/destroy_flow uverbs
        IB/core: extended command: an improved infrastructure for uverbs commands
        IB/core: Remove ib_uverbs_flow_spec structure from userspace
        IB/core: Use a common header for uverbs flow_specs
        IB/core: Make uverbs flow structure use names like verbs ones
        IB/core: Rename 'flow' structs to match other uverbs structs
        IB/core: clarify overflow/underflow checks on ib_create/destroy_flow
        IB/ucma: Convert use of typedef ctl_table to struct ctl_table
        IB/cm: Convert to using idr_alloc_cyclic()
        IB/mlx5: Fix page shift in create CQ for userspace
        IB/mlx4: Fix device max capabilities check
        IB/mlx5: Fix list_del of empty list
        IB/mlx5: Remove dead code
        IB/core: Encorce MR access rights rules on kernel consumers
        IB/mlx4: Fix endless loop in resize CQ
        RDMA/cma: Remove unused argument and minor dead code
        RDMA/ucma: Discard events for IDs not yet claimed by user space
        IB/core: Add Cisco usNIC rdma node and transport types
        RDMA/nes: Remove self-assignment from nes_query_qp()
        IB/srp: Report receive errors correctly
        ...
      1ea406c0
    • Linus Torvalds's avatar
      Merge tag 'for-v3.13' of git://git.infradead.org/battery-2.6 · a709bd58
      Linus Torvalds authored
      Pull battery updates from Anton Vorontsov:
       "Highlights:
         - A new driver for TI BQ24735 Battery Chargers, courtesy of NVidia.
         - Device tree bindings for TWL4030 chips.
         - Random fixes and cleanups"
      
      * tag 'for-v3.13' of git://git.infradead.org/battery-2.6:
        pm2301-charger: Remove unneeded NULL checks
        twl4030_charger: Add devicetree support
        power_supply: Fix documentation for TEMP_*ALERT* properties
        max17042_battery: Support regmap to access device's registers
        max17042_battery: Use SIMPLE_DEV_PM_OPS
        charger-manager : Replace kzalloc to devm_kzalloc and remove uneccessary code
        bq2415x_charger: Fix max battery regulation voltage
        tps65090-charger: Use "IS_ENABLED(CONFIG_OF)" for DT code
        tps65090-charger: Drop devm_free_irq of devm_ allocated irq
        power_supply: Add support for bq24735 charger
        pm2301-charger: Staticize pm2xxx_charger_die_therm_mngt
        pm2301-charger: Check return value of regulator_enable
        ab8500-charger: Remove redundant break
        ab8500-charger: Check return value of regulator_enable
        isp1704_charger: Fix driver to work with changes introduced in v3.5
      a709bd58
    • Linus Torvalds's avatar
      Merge branch 'topic/kbuild-fixes-for-next' of... · 3ea369ee
      Linus Torvalds authored
      Merge branch 'topic/kbuild-fixes-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
      
      Pull media build fixes from Mauro Carvalho Chehab:
       "A series of patches that fix compilation on non-x86 archs.
      
        While most of them are just build fixes, there are some fixes for real
        bugs, as there are a number of drivers using dynamic stack allocation.
        A few of those might be considered a security risk, if the i2c-dev
        module is loaded, as someone could be sending very long I2C data that
        could potentially overflow the Kernel stack.  Ok, as using /dev/i2c-*
        devnodes usually requires root on usual distros, and exploiting it
        would require a DVB board or USB stick, the risk is not high"
      
      * 'topic/kbuild-fixes-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (28 commits)
        [media] platform drivers: Fix build on frv arch
        [media] lirc_zilog: Don't use dynamic static allocation
        [media] mxl111sf: Don't use dynamic static allocation
        [media] af9035: Don't use dynamic static allocation
        [media] af9015: Don't use dynamic static allocation
        [media] dw2102: Don't use dynamic static allocation
        [media] dibusb-common: Don't use dynamic static allocation
        [media] cxusb: Don't use dynamic static allocation
        [media] v4l2-async: Don't use dynamic static allocation
        [media] cimax2: Don't use dynamic static allocation
        [media] tuner-xc2028: Don't use dynamic static allocation
        [media] tuners: Don't use dynamic static allocation
        [media] av7110_hw: Don't use dynamic static allocation
        [media] stv090x: Don't use dynamic static allocation
        [media] stv0367: Don't use dynamic static allocation
        [media] stb0899_drv: Don't use dynamic static allocation
        [media] dvb-frontends: Don't use dynamic static allocation
        [media] dvb-frontends: Don't use dynamic static allocation
        [media] s5h1420: Don't use dynamic static allocation
        [media] uvc/lirc_serial: Fix some warnings on parisc arch
        ...
      3ea369ee
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · a310410f
      Linus Torvalds authored
      Pull media updates from Mauro Carvalho Chehab:
       "This series include:
         - a new Remote Controller driver for ST SoC with the corresponding DT
           bindings
         - a new frontend (cx24117)
         - a new I2C camera flash driver (lm3560)
         - a new mem2mem driver for TI SoC (ti-vpe)
         - support for Raphael r828d added to r820t driver
         - some improvements on buffer allocation at VB2 core
         - usual driver fixes and improvements
      
        PS this time, we have a smaller number of patches.  While it is hard
        to pinpoint to the reasons, I believe that it is mainly due to:
      
         1) there are several patch series ready, but depending on DT review.
            I decided to grant some extra time for DT maintainers to look on
            it, as they're expecting to have more time with the changes agreed
            during ARM mini-summit and KS.  If they can't review in time for
            3.14, I'll review myself and apply for the next merge window.
      
         2) I suspect that having both LinuxCon EU and LinuxCon NA happening
            during the same merge window affected the development
            productivity, as several core media developers participated on
            both events"
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (151 commits)
        [media] media: st-rc: Add ST remote control driver
        [media] gpio-ir-recv: Include linux/of.h header
        [media] tvp7002: Include linux/of.h header
        [media] tvp514x: Include linux/of.h header
        [media] ths8200: Include linux/of.h header
        [media] adv7343: Include linux/of.h header
        [media] v4l: Fix typo in v4l2_subdev_get_try_crop()
        [media] media: i2c: add driver for dual LED Flash, lm3560
        [media] rtl28xxu: add 15f4:0131 Astrometa DVB-T2
        [media] rtl28xxu: add RTL2832P + R828D support
        [media] rtl2832: add new tuner R828D
        [media] r820t: add support for R828D
        [media] media/i2c: ths8200: fix build failure with gcc 4.5.4
        [media] Add support for KWorld UB435-Q V2
        [media] staging/media: fix msi3101 build errors
        [media] ddbridge: Remove casting the return value which is a void pointer
        [media] ngene: Remove casting the return value which is a void pointer
        [media] dm1105: remove unneeded not-null test
        [media] sh_mobile_ceu_camera: remove deprecated IRQF_DISABLED
        [media] media: rcar_vin: Add preliminary r8a7790 support
        ...
      a310410f
    • Linus Torvalds's avatar
      Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac · cdd278db
      Linus Torvalds authored
      Pull EDAC driver updates from Mauro Carvalho Chehab:
       - sb_edac: add support for Ivy Bridge support
       - cell_edac: add a missing of_node_put() call
      
      * 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
        cell_edac: fix missing of_node_put
        sb_edac: add support for Ivy Bridge
        sb_edac: avoid decoding the same error multiple times
        sb_edac: rename mci_bind_devs()
        sb_edac: enable multiple PCI id tables to be used
        sb_edac: rework sad_pkg
        sb_edac: allow different interleave lists
        sb_edac: allow different dram_rule arrays
        sb_edac: isolate TOHM retrieval
        sb_edac: rename pci_br
        sb_edac: isolate TOLM retrieval
        sb_edac: make RANK_CFG_A value part of sbridge_info
      cdd278db
    • Linus Torvalds's avatar
      Merge tag 'edac_for_3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 794e96e8
      Linus Torvalds authored
      Pull EDAC updates from Borislav Petkov:
       "Following up on last week's discussion, here's my part of the EDAC
        pile, highlights in the signed tag.
      
        The last two patches have a date from just now because I've just
        applied them to the tree after Johannes sent them to me earlier.  I
        decided to forward them now because they're trivial.
      
        There's a third one for MPC85xx which adds PCIe error interrupt
        support but since it is not so trivial and hasn't seen any linux-next
        time, I'm deferring it to 3.14
      
        EDAC update highlights:
         - Support for Calxeda ECX-2000 memory controller, from Robert Richter
         - Misc Calxeda Highbank drivers and EDAC core cleanups, from Rob
           Herring and Robert Richter
         - New maintainer for Freescale's MPC85xx EDAC driver: Johannes
           Thumshirn"
      
      * tag 'edac_for_3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        edac/85xx: Remove mpc85xx_pci_err_remove
        EDAC: Add edac-mpc85xx driver to MAINTAINERS
        edac, highbank: Moving error injection to sysfs for edac
        edac, highbank: Add MAINTAINERS entry
        edac: Unify reporting of device info for device, mc and pci
        edac, highbank: Improve and unify naming
        edac, highbank: Add Calxeda ECX-2000 support
        ARM: dts: calxeda: move memory-controller node out of ecx-common.dtsi
        edac, highbank: Fix interrupt setup of mem and l2 controller
      794e96e8