1. 03 Mar, 2010 25 commits
  2. 02 Mar, 2010 12 commits
  3. 01 Mar, 2010 3 commits
    • Tony Lindgren's avatar
      Merge with mainline to remove plat-omap/Kconfig conflict · d702d121
      Tony Lindgren authored
      Conflicts:
      	arch/arm/plat-omap/Kconfig
      d702d121
    • Linus Torvalds's avatar
      Merge branch 'davinci-for-linus' of... · 13dda80e
      Linus Torvalds authored
      Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci
      
      * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (40 commits)
        DaVinci DM365: Adding support for SPI EEPROM
        DaVinci DM365: Adding DM365 SPI support
        DaVinci DM355: Modifications to DM355 SPI support
        DaVinci: SPI: Adding header file for SPI support.
        davinci: dm646x: CDCE clocks: davinci_clk converted to clk_lookup
        davinci: clkdev cleanup: remove clk_lookup wrapper, use clkdev_add_table()
        DaVinci: DM365: Voice codec support for the DM365 SoC
        davinci: clock: let clk->set_rate function sleep
        Add SDA and SCL pin numbers to i2c platform data
        davinci: da8xx/omap-l1xx: Add EDMA platform data for da850/omap-l138
        davinci: build list of unused EDMA events dynamically
        davinci: Fix edma_alloc_channel api for EDMA_CHANNEL_ANY case
        davinci: Keep count of channel controllers on a platform
        davinci: Correct return value of edma_alloc_channel api
        davinci: add CDCE949 support on DM6467 EVM
        davinci: add support for CDCE949 clock synthesizer
        davinci: da850/omap-l138 EVM: register for suspend support
        davinci: da850/omap-l138: add support for SoC suspend
        davinci: add power management support
        DaVinci: DM365: Changing default queue for DM365.
        ...
      13dda80e
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 379e3a82
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (38 commits)
        sata_via: Delay on vt6420 when starting ATAPI DMA write
        ata: Detect Delkin Devices compact flash
        pata_efar: Enable parallel scanning
        pata_atiixp: enable parallel scan
        [libata] pata_atiixp: add locking for parallel scanning
        [libata] pata_efar: add locking for parallel scanning
        libata: Pass host flags into the pci helper
        [libata] pata_marvell: CONFIG_AHCI is really CONFIG_SATA_AHCI
        libata: Allow pata_legacy to be built on non-ISA but PCI systems
        pata_pdc202xx_old: fix UDMA mode for PDC2026x chipsets
        pata_pdc202xx_old: fix UDMA mode for Promise UDMA33 cards
        [libata] pata_at91: fix backslash-continued string
        pata_via: store UDMA masks in via_isa_bridges table
        pata_via: fix address setup timings underlocking
        pata_serverworks: fix error message
        pata_serverworks: fix PIO setup for the second channel
        pata_efar: fix secondary port support
        pata_cypress: fix PIO timings underclocking
        pata_cs5535: use correct values for PIO1 and PIO2 data timings
        pata_cmd64x: remove unused definitions
        ...
      379e3a82