tree b509b7eaec506cccdadb125c104b76c796c0151a
parent 62ad36a8a6541de82984e4f1a6cff09535d68098
parent 3ec25ebd69dc120d0590e64caaf1477aa88c8a93
author Linus Torvalds <torvalds@linux-foundation.org> 1206912387 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1206912387 -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:
  libata: ATA_EHI_LPM should be ATA_EH_LPM
  pata_sil680: only enable MMIO on Cell blades