1. 26 5月, 2010 4 次提交
    • L
      Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 · 702c0b04
      Linus Torvalds 提交于
      * 'next-spi' of git://git.secretlab.ca/git/linux-2.6:
        spi/xilinx: Fix compile error
        spi/davinci: Fix clock prescale factor computation
        spi: move bitbang txrx utility functions to private header
        spi/mpc5121: Add SPI master driver for MPC5121 PSC
        powerpc/mpc5121: move PSC FIFO memory init to platform code
        spi/ep93xx: implemented driver for Cirrus EP93xx SPI controller
        Documentation/spi/* compile warning fix
        spi/omap2_mcspi: Check params before dereference or use
        spi/omap2_mcspi: add turbo mode support
        spi/omap2_mcspi: change default DMA_MIN_BYTES value to 160
        spi/pl022: fix stop queue procedure
        spi/pl022: add support for the PL023 derivate
        spi/pl022: fix up differences between ARM and ST versions
        spi/spi_mpc8xxx: Do not use map_tx_dma to unmap rx_dma
        spi/spi_mpc8xxx: Fix QE mode Litte Endian
        spi/spi_mpc8xxx: fix potential memory corruption.
      702c0b04
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · c19eb8f0
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        arch/m68knommu/platform/68360/commproc.c: Checkpatch cleanup
        arch/m68knommu/mm/fault.c: Checkpatch cleanup
        m68knommu: improve short help of m68knommu/Kconfig/RAMSIZE for '0' case
        m68knommu: remove un-used mcfsmc.h
        m68knommu: add smc91x support for ColdFire NETtel boards
        m68knommu: add smc91x support to ColdFire 5249 platform
        m68knommu: remove size limit on non-MMU TASK_SIZE
        m68knommu: fix broken use of BUAD_TABLE_SIZE in 68328serial driver
        m68knommu: Coldfire QSPI platform support
      c19eb8f0
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 · 99765cc7
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
        regulator: return set_mode is same mode is requested
        Regulators: ab3100/bq24022: add a missing .owner field in regulator_desc
        twl6030: regulator: Remove vsel tables and use formula for calculation
        mc13783-regulator: fix vaild voltage range checking for mc13783_fixed_regulator_set_voltage
        regulator: use voltage number array in 88pm860x
        regulator: make 88pm860x sharing one driver structure
        regulator: simplify regulator_register() error handling
        regulator: fix unset_regulator_supplies() to remove all matches
        regulator: prevent registration of matching regulator consumer supplies
        regulator: Allow regulator-regulator supplies to be specified by name
      99765cc7
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 51e618c3
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        watchdog: Driver for the watchdog timer on Freescale IMX2 (and later) processors.
        watchdog: s3c2410_wdt - Fix on handling of the request_mem_region fail
        watchdog: s3c2410_wdt - Add extra option to include watchdog for Samsung SoCs
        iTCO_wdt: fix TCO V1 timeout values and limits
        watchdog: twl4030_wdt: Disable watchdog during probing
        watchdog: update/improve/consolidate watchdog driver
        watchdog: booke_wdt: fix ioctl status flags
        watchdog: fix several MODULE_PARM_DESC strings
        watchdog: bfin: use new common Blackfin watchdog header
      51e618c3
  2. 25 5月, 2010 36 次提交