1. 22 Oct, 2010 36 commits
  2. 21 Oct, 2010 4 commits
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · b5153163
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (278 commits)
        arm: remove machine_desc.io_pg_offst and .phys_io
        arm: use addruart macro to establish debug mappings
        arm: return both physical and virtual addresses from addruart
        arm/debug: consolidate addruart macros for CONFIG_DEBUG_ICEDCC
        ARM: make struct machine_desc definition coherent with its comment
        eukrea_mbimxsd-baseboard: Pass the correct GPIO to gpio_free
        cpuimx27: fix compile when ULPI is selected
        mach-pcm037_eet: fix compile errors
        Fixing ethernet driver compilation error for i.MX31 ADS board
        cpuimx51: update board support
        mx5: add cpuimx51sd module and its baseboard
        iomux-mx51: fix GPIO_1_xx 's IOMUX configuration
        imx-esdhc: update devices registration
        mx51: add resources for SD/MMC on i.MX51
        iomux-mx51: fix SD1 and SD2's iomux configuration
        clock-mx51: rename CLOCK1 to CLOCK_CCGR for better readability
        clock-mx51: factorize clk_set_parent and clk_get_rate
        eukrea_mbimxsd: add support for DVI displays
        cpuimx25 & cpuimx35: fix OTG port registration in host mode
        i.MX31 and i.MX35 : fix errate TLSbo65953 and ENGcm09472
        ...
      b5153163
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · a8cbf225
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: (26 commits)
        PM / Wakeup: Show wakeup sources statistics in debugfs
        PM: Introduce library for device-specific OPPs (v7)
        PM: Add sysfs attr for rechecking dev hash from PM trace
        PM: Lock PM device list mutex in show_dev_hash()
        PM / Runtime: Remove idle notification after failing suspend
        PM / Hibernate: Modify signature used to mark swap
        PM / Runtime: Reduce code duplication in core helper functions
        PM: Allow wakeup events to abort freezing of tasks
        PM: runtime: add missed pm_request_autosuspend
        PM / Hibernate: Make some boot messages look less scary
        PM / Runtime: Implement autosuspend support
        PM / Runtime: Add no_callbacks flag
        PM / Runtime: Combine runtime PM entry points
        PM / Runtime: Merge synchronous and async runtime routines
        PM / Runtime: Replace boolean arguments with bitflags
        PM / Runtime: Move code in drivers/base/power/runtime.c
        sysfs: Add sysfs_merge_group() and sysfs_unmerge_group()
        PM: Fix potential issue with failing asynchronous suspend
        PM / Wakeup: Introduce wakeup source objects and event statistics (v3)
        PM: Fix signed/unsigned warning in dpm_show_time()
        ...
      a8cbf225
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags · e36f561a
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags:
        Fix IRQ flag handling naming
        MIPS: Add missing #inclusions of <linux/irq.h>
        smc91x: Add missing #inclusion of <linux/irq.h>
        Drop a couple of unnecessary asm/system.h inclusions
        SH: Add missing consts to sys_execve() declaration
        Blackfin: Rename IRQ flags handling functions
        Blackfin: Add missing dep to asm/irqflags.h
        Blackfin: Rename DES PC2() symbol to avoid collision
        Blackfin: Split the BF532 BFIN_*_FIO_FLAG() functions to their own header
        Blackfin: Split PLL code from mach-specific cdef headers
      e36f561a
    • Linus Torvalds's avatar
      Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 · 70ada779
      Linus Torvalds authored
      * 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (53 commits)
        spi/omap2_mcspi: Verify TX reg is empty after TX only xfer with DMA
        spi/omap2_mcspi: disable channel after TX_ONLY transfer in PIO mode
        spi/bfin_spi: namespace local structs
        spi/bfin_spi: init early
        spi/bfin_spi: check per-transfer bits_per_word
        spi/bfin_spi: warn when CS is driven by hardware (CPHA=0)
        spi/bfin_spi: cs should be always low when a new transfer begins
        spi/bfin_spi: fix typo in comment
        spi/bfin_spi: reject unsupported SPI modes
        spi/bfin_spi: use dma_disable_irq_nosync() in irq handler
        spi/bfin_spi: combine duplicate SPI_CTL read/write logic
        spi/bfin_spi: reset ctl_reg bits when setup is run again on a device
        spi/bfin_spi: push all size checks into the transfer function
        spi/bfin_spi: use nosync when disabling the IRQ from the IRQ handler
        spi/bfin_spi: sync hardware state before reprogramming everything
        spi/bfin_spi: save/restore state when suspending/resuming
        spi/bfin_spi: redo GPIO CS handling
        Blackfin: SPI: expand SPI bitmasks
        spi/bfin_spi: use the SPI namespaced bit names
        spi/bfin_spi: drop extra memory we don't need
        ...
      70ada779