diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 08:53:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 08:53:02 -0700 |
| commit | 132ea5e9aa9ce13f62ba45db8e43ec887d1106e9 (patch) | |
| tree | 417d93c83ccaa205efab507df56fc985242ba0ae /arch/powerpc/platforms/iseries/iommu.c | |
| parent | 0e26da0f2200a2fb51844aaa43e365ea9dd5a93d (diff) | |
| parent | cae5a29d3c4ec7c4214966021c9ee827e66bd67b (diff) | |
| download | linux-132ea5e9aa9ce13f62ba45db8e43ec887d1106e9.tar.gz | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/powerpc/platforms/iseries/iommu.c')
0 files changed, 0 insertions, 0 deletions