1. 25 Jul, 2011 39 commits
  2. 24 Jul, 2011 1 commit
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · f1f3b8ea
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        ata: PATA_ARASAN_CF depends on DMADEVICES
        ata: remove unnecessary code
        [libata] Prevent warning during PMP error recovery
        ahci: RAID-mode SATA patch for Intel Panther Point DeviceIDs
        pata_it821x: Fix RAID type display, by adding missing comma
        sata_dwc_460ex: fix error path
        ahci: Enable SB600 64bit DMA on Asus M3A
        libata: report link resume failure as KERN_WARNING instead of ERR
        ahci: move ahci_sb600_softreset to libahci.c and rename it
        libata: leave port thawed after reset failure
        ata: sata_via: Use dev_dbg
        ata: Add and use ata_print_version_once
        ata: Convert ata_<foo>_printk(KERN_<LEVEL> to ata_<foo>_<level>
        ata: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
      f1f3b8ea