tree fa5dec62b73dfad09ad49f1e2797a0e303bd194b
parent 980533b018fda7ae4c4fb6863b75a0e282d2ffd2
parent 1529c69adce1e95f7ae72f0441590c226bbac7fc
author Linus Torvalds <torvalds@linux-foundation.org> 1278034854 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1278034854 -0700

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:
  ata_generic: implement ATA_GEN_* flags and force enable DMA on MBP 7,1
  ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
  libahci: Fix bug in storing EM messages