]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Apr 2009 15:53:02 +0000 (08:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Apr 2009 15:53:02 +0000 (08:53 -0700)
commit132ea5e9aa9ce13f62ba45db8e43ec887d1106e9
tree417d93c83ccaa205efab507df56fc985242ba0ae
parent0e26da0f2200a2fb51844aaa43e365ea9dd5a93d
parentcae5a29d3c4ec7c4214966021c9ee827e66bd67b
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  sata_mv: shorten register names
  sata_mv: workaround errata SATA#13
  sata_mv: cosmetic renames
  sata_mv: workaround errata SATA#26
  sata_mv: workaround errata PCI#7
  sata_mv: replace 0x1f with ATA_PIO4 (v2)
  sata_mv: fix irq mask races
  sata_mv: revert SoC irq breakage
  libata: ahci enclosure management bios workaround
  ata: Add TRIM infrastructure
  ata_piix: VGN-BX297XP wants the controller power up on suspend
  libata: Remove some redundant casts from pata_octeon_cf.c
  pata_artop: typo
drivers/ata/ahci.c
drivers/ata/sata_mv.c